图片上传

ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java

@@ -35,6 +35,16 @@ public class CmsPicAdInfoController extends BaseController {
         return prefix + "/picAdverts";
     }
 
+    /**
+     * 查询图片广告列表
+     */
+    @PostMapping("/cardInfo")
+    @ResponseBody
+    public List<CmsPicAdInfo> queryCardInfo(CmsPicAdInfo cmsPicAdInfo) {
+        List<CmsPicAdInfo> list = cmsPicAdInfoService.selectCmsPicAdInfoList(cmsPicAdInfo);
+        return list;
+    }
+
     /**
      * 查询图片广告列表
      */

ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java

@@ -0,0 +1,51 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.GalleryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @program: ruoyi->GalleryController
+ * @description:
+ * @author: LiuShenlu
+ * @create: 2021-03-25 11:20
+ **/
+@Controller
+@RequestMapping("/content/gallery")
+public class GalleryController extends BaseController {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(GalleryController.class);
+
+    private String prefix = "content/gallery";
+
+    @Autowired
+    private GalleryService galleryService;
+
+    @GetMapping()
+    public String adverts() {
+        return prefix + "/gallery";
+    }
+
+    /**
+     * 上传图库图片
+     *
+     * @param files
+     * @return
+     */
+    @PostMapping(value = "/addGalleryImg")
+    @ResponseBody
+    public Message addGalleryImg(@RequestParam("imgUrl") MultipartFile[] files, @RequestParam("picAdId") String picAdId) {
+        LOGGER.info("上传图库图片控制层方法开始");
+        MultipartFile file = files[0];
+        Message msg = galleryService.addGalleryImg(file, picAdId);
+        LOGGER.info("上传图库图片控制层方法结束");
+        return msg;
+    }
+
+}

ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCode.java

@@ -0,0 +1,517 @@
+package com.ruoyi.content.domain;
+
+import java.util.Date;
+
+public class BaseCode {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_CODE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_TYPE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.ORDER_NO
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_CNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeCname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_ENAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeEname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_TNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeTname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.STATE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String state;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private Date createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String updateRemark;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.BUSINESS_AREA
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String businessArea;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.BRANCH_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.ID
+     *
+     * @return the value of base_code.ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.ID
+     *
+     * @param id the value for base_code.ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_CODE
+     *
+     * @return the value of base_code.CODE_CODE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeCode() {
+        return codeCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_CODE
+     *
+     * @param codeCode the value for base_code.CODE_CODE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeCode(String codeCode) {
+        this.codeCode = codeCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_TYPE
+     *
+     * @return the value of base_code.CODE_TYPE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeType() {
+        return codeType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_TYPE
+     *
+     * @param codeType the value for base_code.CODE_TYPE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.ORDER_NO
+     *
+     * @return the value of base_code.ORDER_NO
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.ORDER_NO
+     *
+     * @param orderNo the value for base_code.ORDER_NO
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_CNAME
+     *
+     * @return the value of base_code.CODE_CNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeCname() {
+        return codeCname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_CNAME
+     *
+     * @param codeCname the value for base_code.CODE_CNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeCname(String codeCname) {
+        this.codeCname = codeCname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_ENAME
+     *
+     * @return the value of base_code.CODE_ENAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeEname() {
+        return codeEname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_ENAME
+     *
+     * @param codeEname the value for base_code.CODE_ENAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeEname(String codeEname) {
+        this.codeEname = codeEname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_TNAME
+     *
+     * @return the value of base_code.CODE_TNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeTname() {
+        return codeTname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_TNAME
+     *
+     * @param codeTname the value for base_code.CODE_TNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeTname(String codeTname) {
+        this.codeTname = codeTname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.STATE
+     *
+     * @return the value of base_code.STATE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.STATE
+     *
+     * @param state the value for base_code.STATE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CREATE_USER
+     *
+     * @return the value of base_code.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CREATE_USER
+     *
+     * @param createUser the value for base_code.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CREATE_TIME
+     *
+     * @return the value of base_code.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CREATE_TIME
+     *
+     * @param createTime the value for base_code.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.UPDATE_USER
+     *
+     * @return the value of base_code.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.UPDATE_USER
+     *
+     * @param updateUser the value for base_code.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.UPDATE_TIME
+     *
+     * @return the value of base_code.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.UPDATE_TIME
+     *
+     * @param updateTime the value for base_code.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.UPDATE_REMARK
+     *
+     * @return the value of base_code.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getUpdateRemark() {
+        return updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.UPDATE_REMARK
+     *
+     * @param updateRemark the value for base_code.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setUpdateRemark(String updateRemark) {
+        this.updateRemark = updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.BUSINESS_AREA
+     *
+     * @return the value of base_code.BUSINESS_AREA
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getBusinessArea() {
+        return businessArea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.BUSINESS_AREA
+     *
+     * @param businessArea the value for base_code.BUSINESS_AREA
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setBusinessArea(String businessArea) {
+        this.businessArea = businessArea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.COMPANY_ID
+     *
+     * @return the value of base_code.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.COMPANY_ID
+     *
+     * @param companyId the value for base_code.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.BRANCH_ID
+     *
+     * @return the value of base_code.BRANCH_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.BRANCH_ID
+     *
+     * @param branchId the value for base_code.BRANCH_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}

ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannel.java

@@ -0,0 +1,273 @@
+package com.ruoyi.content.domain;
+
+public class GalleryChannel {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.PIC_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private Integer picId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.SPECIAL
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String special;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.CHANNEL_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String channelId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.STATE
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String state;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.CREATE_DATE
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.CREATE_TIME
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.COMPANY_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.BRANCH_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.ID
+     *
+     * @return the value of gallery_channel.ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.ID
+     *
+     * @param id the value for gallery_channel.ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.PIC_ID
+     *
+     * @return the value of gallery_channel.PIC_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Integer getPicId() {
+        return picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.PIC_ID
+     *
+     * @param picId the value for gallery_channel.PIC_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setPicId(Integer picId) {
+        this.picId = picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.SPECIAL
+     *
+     * @return the value of gallery_channel.SPECIAL
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getSpecial() {
+        return special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.SPECIAL
+     *
+     * @param special the value for gallery_channel.SPECIAL
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setSpecial(String special) {
+        this.special = special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.CHANNEL_ID
+     *
+     * @return the value of gallery_channel.CHANNEL_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getChannelId() {
+        return channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.CHANNEL_ID
+     *
+     * @param channelId the value for gallery_channel.CHANNEL_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.STATE
+     *
+     * @return the value of gallery_channel.STATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.STATE
+     *
+     * @param state the value for gallery_channel.STATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.CREATE_DATE
+     *
+     * @return the value of gallery_channel.CREATE_DATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.CREATE_DATE
+     *
+     * @param createDate the value for gallery_channel.CREATE_DATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.CREATE_TIME
+     *
+     * @return the value of gallery_channel.CREATE_TIME
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.CREATE_TIME
+     *
+     * @param createTime the value for gallery_channel.CREATE_TIME
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.COMPANY_ID
+     *
+     * @return the value of gallery_channel.COMPANY_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.COMPANY_ID
+     *
+     * @param companyId the value for gallery_channel.COMPANY_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.BRANCH_ID
+     *
+     * @return the value of gallery_channel.BRANCH_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.BRANCH_ID
+     *
+     * @param branchId the value for gallery_channel.BRANCH_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}

ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannelExample.java

@@ -0,0 +1,912 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GalleryChannelExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public GalleryChannelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIsNull() {
+            addCriterion("PIC_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIsNotNull() {
+            addCriterion("PIC_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdEqualTo(Integer value) {
+            addCriterion("PIC_ID =", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotEqualTo(Integer value) {
+            addCriterion("PIC_ID <>", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdGreaterThan(Integer value) {
+            addCriterion("PIC_ID >", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("PIC_ID >=", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdLessThan(Integer value) {
+            addCriterion("PIC_ID <", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdLessThanOrEqualTo(Integer value) {
+            addCriterion("PIC_ID <=", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIn(List<Integer> values) {
+            addCriterion("PIC_ID in", values, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotIn(List<Integer> values) {
+            addCriterion("PIC_ID not in", values, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_ID between", value1, value2, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_ID not between", value1, value2, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNull() {
+            addCriterion("SPECIAL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNotNull() {
+            addCriterion("SPECIAL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialEqualTo(String value) {
+            addCriterion("SPECIAL =", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotEqualTo(String value) {
+            addCriterion("SPECIAL <>", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThan(String value) {
+            addCriterion("SPECIAL >", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThanOrEqualTo(String value) {
+            addCriterion("SPECIAL >=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThan(String value) {
+            addCriterion("SPECIAL <", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThanOrEqualTo(String value) {
+            addCriterion("SPECIAL <=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLike(String value) {
+            addCriterion("SPECIAL like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotLike(String value) {
+            addCriterion("SPECIAL not like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIn(List<String> values) {
+            addCriterion("SPECIAL in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotIn(List<String> values) {
+            addCriterion("SPECIAL not in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialBetween(String value1, String value2) {
+            addCriterion("SPECIAL between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotBetween(String value1, String value2) {
+            addCriterion("SPECIAL not between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNull() {
+            addCriterion("CHANNEL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNotNull() {
+            addCriterion("CHANNEL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdEqualTo(String value) {
+            addCriterion("CHANNEL_ID =", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotEqualTo(String value) {
+            addCriterion("CHANNEL_ID <>", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThan(String value) {
+            addCriterion("CHANNEL_ID >", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_ID >=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThan(String value) {
+            addCriterion("CHANNEL_ID <", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_ID <=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLike(String value) {
+            addCriterion("CHANNEL_ID like", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotLike(String value) {
+            addCriterion("CHANNEL_ID not like", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIn(List<String> values) {
+            addCriterion("CHANNEL_ID in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotIn(List<String> values) {
+            addCriterion("CHANNEL_ID not in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdBetween(String value1, String value2) {
+            addCriterion("CHANNEL_ID between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotBetween(String value1, String value2) {
+            addCriterion("CHANNEL_ID not between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("STATE =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("STATE <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_channel
+     *
+     * @mbggenerated do_not_delete_during_merge Wed Sep 19 10:35:12 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryDTO.java

@@ -0,0 +1,80 @@
+package com.ruoyi.content.domain;
+
+import java.util.List;
+
+public class GalleryDTO {
+
+    private Integer picId;
+    private String imgUrl;
+    private String picAdId;
+    private String companyId;
+    private String picState;
+    private List<String> codeName;
+    private String createDate;
+    private String createTime;
+
+    public Integer getPicId() {
+        return picId;
+    }
+
+    public void setPicId(Integer picId) {
+        this.picId = picId;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getPicAdId() {
+        return picAdId;
+    }
+
+    public void setPicAdId(String picAdId) {
+        this.picAdId = picAdId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPicState() {
+        return picState;
+    }
+
+    public void setPicState(String picState) {
+        this.picState = picState;
+    }
+
+    public List<String> getCodeName() {
+        return codeName;
+    }
+
+    public void setCodeName(List<String> codeName) {
+        this.codeName = codeName;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+}

ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfo.java

@@ -0,0 +1,333 @@
+package com.ruoyi.content.domain;
+
+public class GalleryPicInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.PIC_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private Integer picId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.IMG_URL
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String imgUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.PIC_AD_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String picAdId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.PIC_STATE
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String picState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.COMPANY_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.CREATE_DATE
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.CREATE_TIME
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.CREATE_USER
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.UPDATE_DATE
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.UPDATE_TIME
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.BRANCH_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.PIC_ID
+     *
+     * @return the value of gallery_pic_info.PIC_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public Integer getPicId() {
+        return picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.PIC_ID
+     *
+     * @param picId the value for gallery_pic_info.PIC_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setPicId(Integer picId) {
+        this.picId = picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.IMG_URL
+     *
+     * @return the value of gallery_pic_info.IMG_URL
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.IMG_URL
+     *
+     * @param imgUrl the value for gallery_pic_info.IMG_URL
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.PIC_AD_ID
+     *
+     * @return the value of gallery_pic_info.PIC_AD_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getPicAdId() {
+        return picAdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.PIC_AD_ID
+     *
+     * @param picAdId the value for gallery_pic_info.PIC_AD_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setPicAdId(String picAdId) {
+        this.picAdId = picAdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.PIC_STATE
+     *
+     * @return the value of gallery_pic_info.PIC_STATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getPicState() {
+        return picState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.PIC_STATE
+     *
+     * @param picState the value for gallery_pic_info.PIC_STATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setPicState(String picState) {
+        this.picState = picState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.COMPANY_ID
+     *
+     * @return the value of gallery_pic_info.COMPANY_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.COMPANY_ID
+     *
+     * @param companyId the value for gallery_pic_info.COMPANY_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.CREATE_DATE
+     *
+     * @return the value of gallery_pic_info.CREATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.CREATE_DATE
+     *
+     * @param createDate the value for gallery_pic_info.CREATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.CREATE_TIME
+     *
+     * @return the value of gallery_pic_info.CREATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.CREATE_TIME
+     *
+     * @param createTime the value for gallery_pic_info.CREATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.CREATE_USER
+     *
+     * @return the value of gallery_pic_info.CREATE_USER
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.CREATE_USER
+     *
+     * @param createUser the value for gallery_pic_info.CREATE_USER
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.UPDATE_DATE
+     *
+     * @return the value of gallery_pic_info.UPDATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.UPDATE_DATE
+     *
+     * @param updateDate the value for gallery_pic_info.UPDATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.UPDATE_TIME
+     *
+     * @return the value of gallery_pic_info.UPDATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.UPDATE_TIME
+     *
+     * @param updateTime the value for gallery_pic_info.UPDATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.BRANCH_ID
+     *
+     * @return the value of gallery_pic_info.BRANCH_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.BRANCH_ID
+     *
+     * @param branchId the value for gallery_pic_info.BRANCH_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}

ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeMapper.java

@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.BaseCodeExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BaseCodeMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int countByExample(BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int deleteByExample(BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int insert(BaseCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int insertSelective(BaseCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    List<BaseCode> selectByExample(BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    BaseCode selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") BaseCode record, @Param("example") BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByExample(@Param("record") BaseCode record, @Param("example") BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByPrimaryKeySelective(BaseCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByPrimaryKey(BaseCode record);
+}

ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryChannelMapper.java

@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.GalleryChannel;
+import com.ruoyi.content.domain.GalleryChannelExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GalleryChannelMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int countByExample(GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int deleteByExample(GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int insert(GalleryChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int insertSelective(GalleryChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    List<GalleryChannel> selectByExample(GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    GalleryChannel selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") GalleryChannel record, @Param("example") GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByExample(@Param("record") GalleryChannel record, @Param("example") GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByPrimaryKeySelective(GalleryChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByPrimaryKey(GalleryChannel record);
+}

ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryPicInfoMapper.java

@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.GalleryPicInfo;
+import com.ruoyi.content.domain.GalleryPicInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GalleryPicInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int countByExample(GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int deleteByExample(GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int deleteByPrimaryKey(Integer picId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int insert(GalleryPicInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int insertSelective(GalleryPicInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    List<GalleryPicInfo> selectByExample(GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    GalleryPicInfo selectByPrimaryKey(Integer picId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") GalleryPicInfo record, @Param("example") GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByExample(@Param("record") GalleryPicInfo record, @Param("example") GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByPrimaryKeySelective(GalleryPicInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByPrimaryKey(GalleryPicInfo record);
+}

ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java

@@ -0,0 +1,20 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.GalleryPicInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GalleryQueryMapper {
+
+    public List<GalleryPicInfo> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
+                                                   @Param(value = "picState") List<String> picState, @Param(value = "picId") List<Integer> picId,
+                                                   @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+
+    public List<String> selectChannelId(@Param(value = "picId") Integer picId);
+
+    public List<GalleryPicInfo> selectAllPicInfo(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
+                                                 @Param(value = "picState") List<String> picState, @Param(value = "picId") List<Integer> picId);
+}

ruoyi-content/src/main/java/com/ruoyi/content/message/Message.java

@@ -0,0 +1,48 @@
+package com.ruoyi.content.message;
+
+public class Message {
+
+    private boolean result;//结果
+    private String info;//消息
+    private Object object;
+
+    public Message() {
+
+    }
+
+    public Message(boolean reslut, String info) {
+        setInfo(info);
+        setResult(reslut);
+    }
+
+    public Message(boolean reslut, String info, Object object) {
+        setInfo(info);
+        setResult(reslut);
+        setObject(object);
+    }
+
+    public boolean getResult() {
+        return result;
+    }
+
+    public void setResult(boolean result) {
+        this.result = result;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public Object getObject() {
+        return object;
+    }
+
+    public void setObject(Object object) {
+        this.object = object;
+    }
+
+}

ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.GalleryDTO;
+import com.ruoyi.content.message.Message;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface GalleryService {
+
+
+    /**
+     * 图片上传
+     *
+     * @param file
+     * @param picAdId
+     * @return
+     */
+    public Message addGalleryImg(MultipartFile file, String picAdId);
+
+    /**
+     * 图库列表
+     *
+     * @param channelId
+     * @param picState
+     * @return
+     */
+    public List<GalleryDTO> galleryImgList(int startRow, int rows, String channelId, String picState, String special);
+
+    /**
+     * 图片个数
+     *
+     * @param channelId
+     * @param picState
+     * @return
+     */
+    public int countGalleryPicInfoByState(String channelId, String picState);
+
+    /**
+     * 图片图库录入
+     *
+     * @param channelId
+     * @param picId
+     * @return
+     */
+    public Message addGallery(String channelId, String picId);
+
+    /**
+     * 图库栏目下图片删除
+     *
+     * @param ids
+     * @param channelId
+     * @return
+     */
+    public Message delGallery(String ids, String channelId);
+
+    /**
+     * 图片删除
+     *
+     * @param ids
+     * @return
+     */
+    public Message delGalleryPic(String ids);
+}

ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java

@@ -0,0 +1,403 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.domain.*;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.BaseCodeMapper;
+import com.ruoyi.content.mapper.GalleryChannelMapper;
+import com.ruoyi.content.mapper.GalleryPicInfoMapper;
+import com.ruoyi.content.mapper.GalleryQueryMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.redis.RedisManager;
+import com.ruoyi.content.service.GalleryService;
+import com.ruoyi.content.utils.ImgCompress;
+import com.ruoyi.content.utils.JsonUtil;
+import com.ruoyi.content.utils.OSSUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class GalleryServiceImpl implements GalleryService {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(GalleryServiceImpl.class);
+
+    @Autowired
+    private GalleryPicInfoMapper galleryInfoMapper;
+    @Autowired
+    private GalleryQueryMapper galleryQueryMapper;
+    @Autowired
+    private GalleryChannelMapper galleryChannelMapper;
+    @Autowired
+    private RedisManager redisManager;
+    @Autowired
+    private BaseCodeMapper baseCodeMapper;
+
+    /**
+     * 将图库图片保存到OSS
+     */
+    @Override
+    public Message addGalleryImg(MultipartFile file, String picAdId) {
+        LOGGER.info("上传图片业务层开始");
+        Message msg = new Message(true, "上传图片成功");
+        // 公司id
+        String companyId = "1";
+        String branchId = "86";
+        try {
+            // 文件名
+            String fileName = file.getOriginalFilename();
+            // 文件后缀
+            String ext = fileName.substring(fileName.lastIndexOf("."));
+            String fileTime = DateUtils.getMillisecond();
+            // OSS保存路径
+            fileName = PropertiesConstants.GALLERY_IMG_PATH + fileTime + ext;
+            String flag = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, file.getInputStream(), PropertiesConstants.OSSPATH + fileName);
+            byte[] bytes = null;
+            InputStream inStream = file.getInputStream();
+            BufferedImage read = ImageIO.read(inStream);
+            int width = read.getWidth();
+            int height = read.getHeight();
+            LOGGER.info("图片高度为height【{}】", height);
+            if (height > 2000) {
+                LOGGER.info("图片为长图进行剪切");
+                BufferedImage sub = read.getSubimage(0, 0, width, 2000);
+                ByteArrayOutputStream bStream = new ByteArrayOutputStream();
+                ImageOutputStream imgOut = ImageIO.createImageOutputStream(bStream);
+                String formatName = fileName.substring(fileName.lastIndexOf(".") + 1);
+                LOGGER.info("图片格式为formatName【{}】", formatName);
+                boolean writeFlag = ImageIO.write(sub, formatName, imgOut);
+                if (writeFlag) {
+                    inStream = new ByteArrayInputStream(bStream.toByteArray());
+                } else {
+                    LOGGER.info("图片剪切失败");
+                }
+                ImgCompress compress = new ImgCompress(inStream);
+                bytes = compress.resize(320, 800);
+            } else {
+                ImgCompress compress = new ImgCompress(file.getInputStream());
+                bytes = compress.resize(320, 516);
+            }
+
+            InputStream ins = new ByteArrayInputStream(bytes);
+            String minImgUrl = PropertiesConstants.GALLERY_MINIMG_PATH + fileTime + ext;// OSS保存路径
+            String flag2 = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, ins, PropertiesConstants.OSSPATH + minImgUrl);
+            if (null == flag || flag.equals("false") || flag2 == null || flag2.equals("false")) {
+                LOGGER.info("新增图库信息,图片上传OSS发生异常");
+                msg.setInfo("新增图库信息,图片上传异常");
+                msg.setResult(false);
+            } else {
+                GalleryPicInfo galleryInfo = new GalleryPicInfo();
+                String createDate = DateUtils.getDate();
+                String createTime = DateUtils.getTimeNow();
+                galleryInfo.setPicId(null);
+                galleryInfo.setImgUrl(PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + minImgUrl);
+                if (StringUtils.isNotBlank(picAdId)) {
+                    galleryInfo.setPicAdId(picAdId);
+                }
+                galleryInfo.setPicState("0");
+                galleryInfo.setCompanyId(companyId);
+                galleryInfo.setCreateDate(createDate);
+                galleryInfo.setCreateTime(createTime);
+                galleryInfo.setBranchId(branchId);
+                LOGGER.info("数据库新增图库图片");
+                galleryInfoMapper.insertSelective(galleryInfo);
+            }
+        } catch (IOException e) {
+            LOGGER.info("上传图片失败【{}】", e.getMessage());
+            msg.setInfo("上传图片上传异常");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        LOGGER.info("上传图片业务层结束");
+        return msg;
+    }
+
+    @Override
+    public List<GalleryDTO> galleryImgList(int startRow, int rows, String channelId, String picState, String special) {
+        LOGGER.info("拿到的参数startRow【{}】，rows【{}】，所属栏目【{}】，图片状态【{}】", startRow, rows, channelId, picState);
+        String companyId = "1";// 公司id
+        String branchId = "86";
+        List<String> list = new ArrayList<String>();
+        List<Integer> picIds = new ArrayList<>();
+        if (StringUtils.isBlank(picState)) {
+            list.add("0");
+            list.add("1");
+        } else {
+            list.add(picState);
+        }
+
+        if (StringUtils.isBlank(channelId)) {
+            channelId = "";
+        } else {
+            LOGGER.info("所属分公司机构【{}】", branchId);
+            GalleryChannelExample example = new GalleryChannelExample();
+            example.isDistinct();
+//			example.createCriteria().andChannelIdEqualTo(channelId).andStateEqualTo("0").andBranchIdLike("%"+branchId+"%");
+            example.createCriteria().andSpecialEqualTo(special).andChannelIdEqualTo(channelId).andStateEqualTo("0").andBranchIdLike("%" + branchId + "%");
+            List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+            if (galleryChannels == null || galleryChannels.size() < 1) {
+                LOGGER.info("未查询到栏目【{}】数据", channelId);
+                throw new BusinessException("图库该栏目暂没有海报！");
+            }
+            for (GalleryChannel galleryChannel : galleryChannels) {
+                picIds.add(galleryChannel.getPicId());
+            }
+        }
+
+        List<GalleryPicInfo> galleryList = galleryQueryMapper.selectAllWithLimit(companyId, branchId, list, picIds, startRow, rows);
+        if (galleryList == null || galleryList.size() < 1) {
+            LOGGER.info("未查询到数据");
+            throw new BusinessException("图库暂没有海报！");
+        }
+
+        //所属二级栏目
+        List<GalleryDTO> galleryDTOs = new ArrayList<>();
+        for (GalleryPicInfo galleryPicInfo : galleryList) {
+            GalleryDTO galleryDTO = new GalleryDTO();
+            galleryDTO.setPicId(galleryPicInfo.getPicId());
+            galleryDTO.setImgUrl(galleryPicInfo.getImgUrl());
+            galleryDTO.setPicAdId(galleryPicInfo.getPicAdId());
+            galleryDTO.setPicState(galleryPicInfo.getPicState());
+            galleryDTO.setCompanyId(galleryPicInfo.getCompanyId());
+            galleryDTO.setCreateDate(galleryPicInfo.getCreateDate());
+            galleryDTO.setCreateTime(galleryPicInfo.getCreateTime());
+            LOGGER.info("图库数据【{}】", JsonUtil.objectToJackson(galleryDTO));
+            List<String> codeName = new ArrayList<>();
+//			List<String> channelIds = galleryQueryMapper.selectChannelId(galleryPicInfo.getPicId());
+//			for (String string : channelIds) {
+//				LOGGER.info("栏目id【{}】", string);
+//				BaseCodeExample example = new BaseCodeExample();
+//				BaseCodeExample.Criteria criteria = example.createCriteria();
+//				criteria.andCodeCodeEqualTo(string).andStateEqualTo("0").andCodeTypeEqualTo("GALLERY");
+
+            GalleryChannelExample channelexample = new GalleryChannelExample();
+            channelexample.createCriteria().andPicIdEqualTo(galleryPicInfo.getPicId()).andStateEqualTo("0");
+            List<GalleryChannel> galleryChannels = this.galleryChannelMapper.selectByExample(channelexample);
+            for (GalleryChannel galleryChannel : galleryChannels) {
+                LOGGER.info("栏目id【{}】", JsonUtil.objectToJackson(galleryChannel));
+                BaseCodeExample example = new BaseCodeExample();
+                BaseCodeExample.Criteria criteria = example.createCriteria();
+                criteria.andCodeCodeEqualTo(galleryChannel.getChannelId()).andStateEqualTo("0")
+                        .andCodeTypeEqualTo(galleryChannel.getSpecial());
+                List<BaseCode> baseCodes = this.baseCodeMapper.selectByExample(example);
+                LOGGER.info("栏目数据【{}】", JsonUtil.objectToJackson(baseCodes));
+                if ((baseCodes != null) && (baseCodes.size() > 0)) {
+                    codeName.add(((BaseCode) baseCodes.get(0)).getCodeCname());
+                }
+            }
+            galleryDTO.setCodeName(codeName);
+            galleryDTOs.add(galleryDTO);
+        }
+
+        return galleryDTOs;
+    }
+
+    @Override
+    public Message addGallery(String channelId, String picId) {
+        LOGGER.info("增加图库栏目关系的业务层方法开始！");
+        Message msg = new Message();
+        String companyId = "1";
+        String branchId = "86";
+
+        BaseCode baseCode = this.baseCodeMapper.selectByPrimaryKey(Integer.valueOf(channelId));
+        GalleryChannelExample example = new GalleryChannelExample();
+        example.createCriteria().andSpecialEqualTo(baseCode.getCodeType()).andChannelIdEqualTo(baseCode.getCodeCode())
+                .andPicIdEqualTo(Integer.valueOf(picId)).andStateEqualTo("0").andCompanyIdEqualTo(companyId);
+        List selectByExample = this.galleryChannelMapper.selectByExample(example);
+        if ((selectByExample != null) && (selectByExample.size() > 0)) {
+            LOGGER.info("添加图库关系失败,此海报已在栏目【{}】下展示", baseCode.getCodeCname());
+            msg.setInfo("此海报在该栏目下已存在！");
+            msg.setResult(false);
+            return msg;
+        }
+
+        GalleryChannel galleryChannel = new GalleryChannel();
+        String createDate = DateUtils.getDate();
+        String createTime = DateUtils.getTimeNow();
+        galleryChannel.setId(null);
+        galleryChannel.setPicId(Integer.valueOf(picId));
+//		galleryChannel.setChannelId(channelId);
+        galleryChannel.setChannelId(baseCode.getCodeCode());
+        galleryChannel.setCompanyId(companyId);
+        galleryChannel.setBranchId(branchId);
+        galleryChannel.setCreateDate(createDate);
+        galleryChannel.setCreateTime(createTime);
+//		galleryChannel.setSpecial("GALLERY");
+        galleryChannel.setSpecial(baseCode.getCodeType());
+        galleryChannel.setState("0");
+        if (galleryChannelMapper.insert(galleryChannel) > 0) {
+            msg.setInfo("添加成功！");
+            msg.setResult(true);
+            LOGGER.info("添加成功！");
+//			redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
+            this.redisManager.delete("gallery_channel_" + galleryChannel.getSpecial() + "_" + galleryChannel.getChannelId());
+            LOGGER.info("删除redis图库原有栏目关系成功！");
+        } else {
+            LOGGER.info("添加图库关系失败");
+//			msg.setInfo("添加关系失败！");
+            msg.setInfo("分配失败！");
+            msg.setResult(false);
+        }
+        LOGGER.info("增加文章栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public Message delGallery(String channelId, String id) {
+        LOGGER.info("删除图库栏目关系的业务层方法开始！");
+        LOGGER.info("删除图库栏目关系的业务层方法中图片的id【{}】", id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            LOGGER.info("删除图库信息失败，缺少参数");
+            throw new ParameterException("未查询到图库信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        try {
+            String[] arrId = id.split(",");
+            for (String picId : arrId) {
+                if (StringUtils.isNotBlank(picId)) {
+                    GalleryChannelExample example = new GalleryChannelExample();
+                    example.createCriteria().andChannelIdEqualTo(channelId).andPicIdEqualTo(Integer.valueOf(picId)).andStateEqualTo("0");
+                    List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+                    GalleryChannel galleryChannel = galleryChannels.get(0);
+                    if (galleryChannel != null) {
+                        galleryChannel.setState("1");
+                        if (galleryChannelMapper.updateByPrimaryKey(galleryChannel) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("删除图库栏目关系成功！");
+//							redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
+                            this.redisManager.delete("gallery_channel_" + galleryChannel.getSpecial() + "_" + galleryChannel.getChannelId());
+                            LOGGER.info("删除redis图库栏目关系成功！");
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("删除图库栏目关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除图库栏目关系失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除图库栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public int countGalleryPicInfoByState(String channelId, String picState) {
+        LOGGER.info("统计图片数量的业务层方法开始！");
+        String companyId = "1";// 管理员公司id
+        String branchId = "86";
+        LOGGER.info("统计图片数量的业务层方法中拿到的 所属栏目【{}】、文章状态【{}】", channelId, picState);
+        List<String> list = new ArrayList<String>();
+        List<Integer> picIds = new ArrayList<>();
+        if (StringUtils.isBlank(picState)) {
+            list.add("0");
+            list.add("1");
+        } else {
+            list.add(picState);
+        }
+        if (StringUtils.isBlank(channelId)) {
+            channelId = "";
+        } else {
+            GalleryChannelExample example = new GalleryChannelExample();
+            example.isDistinct();
+            example.createCriteria().andChannelIdEqualTo(channelId).andStateEqualTo("0").andBranchIdLike("%" + branchId + "%");
+            List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+            if (galleryChannels == null || galleryChannels.size() < 1) {
+                LOGGER.info("未查询到栏目【{}】数据", channelId);
+                throw new BusinessException("图库该栏目暂没有海报！");
+            }
+            for (GalleryChannel galleryChannel : galleryChannels) {
+                picIds.add(galleryChannel.getPicId());
+            }
+        }
+
+        List<GalleryPicInfo> galleryList = null;
+        try {
+            galleryList = galleryQueryMapper.selectAllPicInfo(companyId, branchId, list, picIds);
+            if (galleryList == null || galleryList.size() < 1) {
+                LOGGER.info("根据公司查询图片，未查询到数据companyId【{}】,branchId【{}】", companyId, branchId);
+                return 0;
+            }
+        } catch (Exception e) {
+            LOGGER.info("统计图片数量的业务层方法产生异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("统计图片数量的业务层方法结束！");
+        return galleryList.size();
+    }
+
+    @Override
+    public Message delGalleryPic(String ids) {
+        LOGGER.info("删除图片信息的业务层方法开始！");
+        LOGGER.info("删除图片信息的业务层方法中拿到的图片的id【{}】", ids);
+        Message msg = new Message();
+        if (StringUtils.isBlank(ids)) {
+            LOGGER.info("删除图片信息失败，缺少参数");
+            throw new ParameterException("未查询到图片信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        try {
+            String[] arrId = ids.split(",");
+            for (String picId : arrId) {
+                if (StringUtils.isNotBlank(picId)) {
+                    GalleryPicInfo galleryPicInfo = galleryInfoMapper.selectByPrimaryKey(Integer.valueOf(picId));
+                    GalleryChannelExample example = new GalleryChannelExample();
+                    example.createCriteria().andPicIdEqualTo(Integer.valueOf(picId)).andStateEqualTo("0");
+                    List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+                    for (GalleryChannel galleryChannel : galleryChannels) {
+                        galleryChannel.setState("1");
+                        if (galleryChannelMapper.updateByPrimaryKey(galleryChannel) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("删除此图片图库栏目关系成功！");
+                            //redisManager.deleteZSet("gallery_channel_"+galleryChannel.getChannelId(),picId);
+//							redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
+                            this.redisManager.delete("gallery_channel_" + galleryChannel.getSpecial() + "_" + galleryChannel.getChannelId());
+                            LOGGER.info("删除redis图库栏目关系成功！");
+                        }
+                    }
+                    if (galleryPicInfo != null) {
+                        galleryPicInfo.setPicState("1");
+                        if (galleryInfoMapper.updateByPrimaryKey(galleryPicInfo) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("删除图片信息成功！");
+                            redisManager.delete("gallery_pic_Id" + galleryPicInfo.getPicId());
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("删除图片信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除图片信息的业务层方法结束！");
+        return msg;
+    }
+
+}

ruoyi-content/src/main/java/com/ruoyi/content/utils/ImgCompress.java

@@ -0,0 +1,103 @@
+package com.ruoyi.content.utils;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+
+/**
+ * 图片压缩处理
+ *
+ * @author liudajin
+ */
+public class ImgCompress {
+    private Image img;
+    private int width;
+    private int height;
+
+    @SuppressWarnings("deprecation")
+    public static void main(String[] args) throws Exception {
+        System.out.println("开始：" + new Date().toLocaleString());
+        ImgCompress imgCom = new ImgCompress("C:\\temp\\pic123.jpg");
+        imgCom.resizeFix(400, 400);
+        System.out.println("结束：" + new Date().toLocaleString());
+    }
+
+    /**
+     * 构造函数
+     */
+    public ImgCompress(String fileName) throws IOException {
+        File file = new File(fileName);// 读入文件  
+        img = ImageIO.read(file);      // 构造Image对象  
+        width = img.getWidth(null);    // 得到源图宽  
+        height = img.getHeight(null);  // 得到源图长  
+    }
+
+    /**
+     * 构造函数
+     */
+    public ImgCompress(InputStream ins) throws IOException {
+        img = ImageIO.read(ins);      // 构造Image对象
+        width = img.getWidth(null);    // 得到源图宽
+        height = img.getHeight(null);  // 得到源图长
+    }
+
+    /**
+     * 按照宽度还是高度进行压缩
+     *
+     * @param w int 最大宽度
+     * @param h int 最大高度
+     */
+    public byte[] resizeFix(int w, int h) throws IOException {
+        if (width / height > w / h) {
+            return resizeByWidth(w);
+        } else {
+            return resizeByHeight(h);
+        }
+    }
+
+    /**
+     * 以宽度为基准，等比例放缩图片
+     *
+     * @param w int 新宽度
+     */
+    public byte[] resizeByWidth(int w) throws IOException {
+        int h = (int) (height * w / width);
+        return resize(w, h);
+    }
+
+    /**
+     * 以高度为基准，等比例缩放图片
+     *
+     * @param h int 新高度
+     */
+    public byte[] resizeByHeight(int h) throws IOException {
+        int w = (int) (width * h / height);
+        return resize(w, h);
+    }
+
+    /**
+     * 强制压缩/放大图片到固定的大小
+     *
+     * @param w int 新宽度
+     * @param h int 新高度
+     */
+    public byte[] resize(int w, int h) throws IOException {
+        // SCALE_SMOOTH 的缩略算法 生成缩略图片的平滑度的 优先级比速度高 生成的图片质量比较好 但速度慢  
+        BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+        image.getGraphics().drawImage(img, 0, 0, w, h, null); // 绘制缩小后的图  
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        // 可以正常实现bmp、png、gif转jpg  
+        JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
+        encoder.encode(image); // JPEG编码  
+        byte[] bytes = out.toByteArray();
+        return bytes;
+    }
+}  

ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml

@@ -0,0 +1,463 @@
+<?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.ruoyi.content.mapper.BaseCodeMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="CODE_CODE" property="codeCode" jdbcType="VARCHAR" />
+    <result column="CODE_TYPE" property="codeType" jdbcType="VARCHAR" />
+    <result column="ORDER_NO" property="orderNo" jdbcType="VARCHAR" />
+    <result column="CODE_CNAME" property="codeCname" jdbcType="VARCHAR" />
+    <result column="CODE_ENAME" property="codeEname" jdbcType="VARCHAR" />
+    <result column="CODE_TNAME" property="codeTname" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+    <result column="BUSINESS_AREA" property="businessArea" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    ID, CODE_CODE, CODE_TYPE, ORDER_NO, CODE_CNAME, CODE_ENAME, CODE_TNAME, STATE, CREATE_USER, 
+    CREATE_TIME, UPDATE_USER, UPDATE_TIME, UPDATE_REMARK, BUSINESS_AREA, COMPANY_ID, 
+    BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.BaseCodeExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_base_code
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_base_code
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    delete from cms_base_code
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.BaseCodeExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    delete from cms_base_code
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+  <!--   <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_base_code (ID, CODE_CODE, CODE_TYPE,
+      ORDER_NO, CODE_CNAME, CODE_ENAME, 
+      CODE_TNAME, STATE, CREATE_USER, 
+      CREATE_TIME, UPDATE_USER, UPDATE_TIME, 
+      UPDATE_REMARK, BUSINESS_AREA, COMPANY_ID, 
+      BRANCH_ID)
+    values (#{id,jdbcType=INTEGER}, #{codeCode,jdbcType=VARCHAR}, #{codeType,jdbcType=VARCHAR}, 
+      #{orderNo,jdbcType=VARCHAR}, #{codeCname,jdbcType=VARCHAR}, #{codeEname,jdbcType=VARCHAR}, 
+      #{codeTname,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{updateRemark,jdbcType=VARCHAR}, #{businessArea,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, 
+      #{branchId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+<!--     <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_base_code
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      ID,
+      <if test="codeCode != null" >
+        CODE_CODE,
+      </if>
+      <if test="codeType != null" >
+        CODE_TYPE,
+      </if>
+      <if test="orderNo != null" >
+        ORDER_NO,
+      </if>
+      <if test="codeCname != null" >
+        CODE_CNAME,
+      </if>
+      <if test="codeEname != null" >
+        CODE_ENAME,
+      </if>
+      <if test="codeTname != null" >
+        CODE_TNAME,
+      </if>
+      <if test="state != null" >
+        STATE,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK,
+      </if>
+      <if test="businessArea != null" >
+        BUSINESS_AREA,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{id,jdbcType=INTEGER},
+      <if test="codeCode != null" >
+        #{codeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="codeType != null" >
+        #{codeType,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null" >
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="codeCname != null" >
+        #{codeCname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeEname != null" >
+        #{codeEname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeTname != null" >
+        #{codeTname,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateRemark != null" >
+        #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="businessArea != null" >
+        #{businessArea,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.BaseCodeExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    select count(*) from cms_base_code
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.codeCode != null" >
+        CODE_CODE = #{record.codeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeType != null" >
+        CODE_TYPE = #{record.codeType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderNo != null" >
+        ORDER_NO = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeCname != null" >
+        CODE_CNAME = #{record.codeCname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeEname != null" >
+        CODE_ENAME = #{record.codeEname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeTname != null" >
+        CODE_TNAME = #{record.codeTname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateRemark != null" >
+        UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessArea != null" >
+        BUSINESS_AREA = #{record.businessArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    set ID = #{record.id,jdbcType=INTEGER},
+      CODE_CODE = #{record.codeCode,jdbcType=VARCHAR},
+      CODE_TYPE = #{record.codeType,jdbcType=VARCHAR},
+      ORDER_NO = #{record.orderNo,jdbcType=VARCHAR},
+      CODE_CNAME = #{record.codeCname,jdbcType=VARCHAR},
+      CODE_ENAME = #{record.codeEname,jdbcType=VARCHAR},
+      CODE_TNAME = #{record.codeTname,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
+      UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      BUSINESS_AREA = #{record.businessArea,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    <set >
+      <if test="codeCode != null" >
+        CODE_CODE = #{codeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="codeType != null" >
+        CODE_TYPE = #{codeType,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null" >
+        ORDER_NO = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="codeCname != null" >
+        CODE_CNAME = #{codeCname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeEname != null" >
+        CODE_ENAME = #{codeEname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeTname != null" >
+        CODE_TNAME = #{codeTname,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="businessArea != null" >
+        BUSINESS_AREA = #{businessArea,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    set CODE_CODE = #{codeCode,jdbcType=VARCHAR},
+      CODE_TYPE = #{codeType,jdbcType=VARCHAR},
+      ORDER_NO = #{orderNo,jdbcType=VARCHAR},
+      CODE_CNAME = #{codeCname,jdbcType=VARCHAR},
+      CODE_ENAME = #{codeEname,jdbcType=VARCHAR},
+      CODE_TNAME = #{codeTname,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      BUSINESS_AREA = #{businessArea,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml

@@ -0,0 +1,352 @@
+<?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.ruoyi.content.mapper.GalleryChannelMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="PIC_ID" property="picId" jdbcType="INTEGER" />
+    <result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+    <result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    ID, PIC_ID, SPECIAL, CHANNEL_ID, STATE, CREATE_DATE, CREATE_TIME, COMPANY_ID, BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.GalleryChannelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_gallery_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_gallery_channel
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    delete from cms_gallery_channel
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.GalleryChannelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    delete from cms_gallery_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_channel (ID, PIC_ID, SPECIAL,
+      CHANNEL_ID, STATE, CREATE_DATE, 
+      CREATE_TIME, COMPANY_ID, BRANCH_ID
+      )
+    values (#{id,jdbcType=INTEGER}, #{picId,jdbcType=INTEGER}, #{special,jdbcType=VARCHAR}, 
+      #{channelId,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_channel
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      ID,
+      <if test="picId != null" >
+        PIC_ID,
+      </if>
+      <if test="special != null" >
+        SPECIAL,
+      </if>
+      <if test="channelId != null" >
+        CHANNEL_ID,
+      </if>
+      <if test="state != null" >
+        STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{id,jdbcType=INTEGER},
+      <if test="picId != null" >
+        #{picId,jdbcType=INTEGER},
+      </if>
+      <if test="special != null" >
+        #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channelId != null" >
+        #{channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.GalleryChannelExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    select count(*) from cms_gallery_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.picId != null" >
+        PIC_ID = #{record.picId,jdbcType=INTEGER},
+      </if>
+      <if test="record.special != null" >
+        SPECIAL = #{record.special,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channelId != null" >
+        CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    set ID = #{record.id,jdbcType=INTEGER},
+      PIC_ID = #{record.picId,jdbcType=INTEGER},
+      SPECIAL = #{record.special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    <set >
+      <if test="picId != null" >
+        PIC_ID = #{picId,jdbcType=INTEGER},
+      </if>
+      <if test="special != null" >
+        SPECIAL = #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channelId != null" >
+        CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    set PIC_ID = #{picId,jdbcType=INTEGER},
+      SPECIAL = #{special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml

@@ -0,0 +1,383 @@
+<?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.ruoyi.content.mapper.GalleryPicInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <id column="PIC_ID" property="picId" jdbcType="INTEGER" />
+    <result column="IMG_URL" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="PIC_AD_ID" property="picAdId" jdbcType="VARCHAR" />
+    <result column="PIC_STATE" property="picState" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    PIC_ID, IMG_URL, PIC_AD_ID, PIC_STATE, COMPANY_ID, CREATE_DATE, CREATE_TIME, CREATE_USER, 
+    UPDATE_DATE, UPDATE_TIME, BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_gallery_pic_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_gallery_pic_info
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    delete from cms_gallery_pic_info
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    delete from cms_gallery_pic_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="picId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_pic_info (PIC_ID, IMG_URL, PIC_AD_ID,
+      PIC_STATE, COMPANY_ID, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_DATE, 
+      UPDATE_TIME, BRANCH_ID)
+    values (#{picId,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, #{picAdId,jdbcType=VARCHAR}, 
+      #{picState,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="picId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_pic_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      PIC_ID,
+      <if test="imgUrl != null" >
+        IMG_URL,
+      </if>
+      <if test="picAdId != null" >
+        PIC_AD_ID,
+      </if>
+      <if test="picState != null" >
+        PIC_STATE,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{picId,jdbcType=INTEGER},
+      <if test="imgUrl != null" >
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdId != null" >
+        #{picAdId,jdbcType=VARCHAR},
+      </if>
+      <if test="picState != null" >
+        #{picState,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    select count(*) from cms_gallery_pic_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    <set >
+      <if test="record.picId != null" >
+        PIC_ID = #{record.picId,jdbcType=INTEGER},
+      </if>
+      <if test="record.imgUrl != null" >
+        IMG_URL = #{record.imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picAdId != null" >
+        PIC_AD_ID = #{record.picAdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picState != null" >
+        PIC_STATE = #{record.picState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    set PIC_ID = #{record.picId,jdbcType=INTEGER},
+      IMG_URL = #{record.imgUrl,jdbcType=VARCHAR},
+      PIC_AD_ID = #{record.picAdId,jdbcType=VARCHAR},
+      PIC_STATE = #{record.picState,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    <set >
+      <if test="imgUrl != null" >
+        IMG_URL = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdId != null" >
+        PIC_AD_ID = #{picAdId,jdbcType=VARCHAR},
+      </if>
+      <if test="picState != null" >
+        PIC_STATE = #{picState,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    set IMG_URL = #{imgUrl,jdbcType=VARCHAR},
+      PIC_AD_ID = #{picAdId,jdbcType=VARCHAR},
+      PIC_STATE = #{picState,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </update>
+</mapper>

ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml

@@ -0,0 +1,118 @@
+<?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.ruoyi.content.mapper.GalleryQueryMapper">
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 11 10:57:31 CST 2018.
+    -->
+    <id column="PIC_ID" property="picId" jdbcType="INTEGER" />
+    <result column="IMG_URL" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="PIC_AD_ID" property="picAdId" jdbcType="VARCHAR" />
+    <result column="PIC_STATE" property="picState" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  
+   <sql id="adTitleSQL">
+   	 SELECT ad.PIC_AD_NAME
+   	 FROM cms_pic_ad_info ad
+   	 WHERE ad.PIC_AD_ID = pi.PIC_AD_ID	 
+   </sql>
+	<select id="selectAllWithLimit"
+		resultMap="BaseResultMap">
+		SELECT
+		pi.PIC_ID,
+		pi.IMG_URL,
+       (
+		<include refid="adTitleSQL" />
+		) as PIC_AD_ID,
+		pi.PIC_STATE,
+		pi.COMPANY_ID,
+		pi.CREATE_DATE,
+		pi.CREATE_TIME,
+		pi.CREATE_USER,
+		pi.UPDATE_DATE,
+		pi.UPDATE_TIME
+		FROM cms_gallery_pic_info pi
+		WHERE
+		1=1
+		<if test="companyId != null and companyId !=''">
+			and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+		    and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
+		</if>
+		<if test="picState != null">
+			and pi.PIC_STATE in
+			<foreach collection="picState" item="picState" index="index"
+				open="(" close=")" separator=",">
+				#{picState}
+			</foreach>
+
+		</if>
+		<if test="picId != null and picId.size() > 0">
+			and pi.PIC_ID in
+			<foreach collection="picId" item="picId" index="index"
+				open="(" close=")" separator=",">
+				#{picId}
+			</foreach>
+		</if>
+		order by pi.CREATE_DATE DESC,pi.CREATE_TIME DESC, pi.UPDATE_DATE
+		DESC,pi.UPDATE_TIME DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>	
+	
+	<select id="selectChannelId" resultType="java.lang.String" parameterType="java.lang.Integer" >
+		SELECT distinct CHANNEL_ID
+		FROM cms_gallery_channel
+		WHERE PIC_ID = #{picId,jdbcType=INTEGER} and STATE = '0'
+	</select>
+	
+	<select id="selectAllPicInfo"
+		resultMap="BaseResultMap">
+		SELECT
+		pi.PIC_ID,
+		pi.IMG_URL,
+       (
+		<include refid="adTitleSQL" />
+		) as PIC_AD_ID,
+		pi.PIC_STATE,
+		pi.COMPANY_ID,
+		pi.CREATE_DATE,
+		pi.CREATE_TIME,
+		pi.CREATE_USER,
+		pi.UPDATE_DATE,
+		pi.UPDATE_TIME
+		FROM cms_gallery_pic_info pi
+		WHERE
+		1=1
+		<if test="companyId != null and companyId !=''">
+			and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+		    and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
+		</if>
+		<if test="picState != null">
+			and pi.PIC_STATE in
+			<foreach collection="picState" item="picState" index="index"
+				open="(" close=")" separator=",">
+				#{picState}
+			</foreach>
+
+		</if>
+		<if test="picId != null and picId.size() > 0">
+			and pi.PIC_ID in
+			<foreach collection="picId" item="picId" index="index"
+				open="(" close=")" separator=",">
+				#{picId}
+			</foreach>
+		</if>
+	</select>	
+</mapper>

ruoyi-content/src/main/resources/static/css/bootstrapValidator.min.css

@@ -0,0 +1,13 @@
+/**
+ * BootstrapValidator (http://bootstrapvalidator.com)
+ *
+ * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
+ *
+ * @version     v0.4.5
+ * @author      https://twitter.com/nghuuphuoc
+ * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
+ * @license     MIT
+ */
+
+
+.bv-form .help-block{margin-bottom:0}.nav-tabs li.bv-tab-success>a{color:#3c763d}.nav-tabs li.bv-tab-error>a{color:#a94442}

ruoyi-content/src/main/resources/templates/content/gallery/gallery.html

@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('图片上传')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form enctype="multipart/form-data" method="post"
+          onsubmit="return iframeCallback(this, pageAjaxDone)" id="formData"
+          class="form-horizontal">
+        <div class="panel panel-primary  panel-width">
+            <div class="panel-heading">
+                <h3 class="panel-title">图片信息</h3>
+            </div>
+            <div class="panel-body">
+
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">分享名片图片：</label>
+                    <div class="col-sm-5">
+                        <input name="imgUrl" id="shareImgs" class="file projectfile" type="file" required/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">添加广告：</label>
+                    <div class="col-sm-3">
+                        <select class="form-control" id="picAdId" name="picAdId">
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table align="center">
+            <br/>
+            <tr>
+                <td></td>
+                <td class="control-label">
+                    <div class="vspace-30"></div>
+                </td>
+                <td align="center" colspan="2"><a
+                        class="btn btn-lg btn-primary" href="#" id="send">保存 <i
+                        class="icon-plus-sign"></i></a></td>
+            </tr>
+        </table>
+    </form>
+</div>
+<div class="modal fade" id="up_showDialog" tabindex="-1" role="dialog" aria-labelledby="gridSystemModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="gridSystemModalLabel">
+                        <span class="glyphicon glyphicon-info-sign" aria-hidden="true"
+                              style="margin-right: 5px; top: 2px;"></span>数据保存
+                </h5>
+            </div>
+            <div class="modal-body">正在上传数据,请耐心等待......</div>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!--创建成功提示-->
+<div class="modal fade" id="successBox" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title fa fa-info-circle" id="myModalLabel">操作提示</h5>
+            </div>
+            <div class="modal-body">恭喜，创建成功！</div>
+            <div class="modal-footer">
+                <a type="button" id="continueAdd" th:href="@{/content/gallery}" class="btn btn-sm btn-primary">继续创建</a>
+                <a type="button" id="goList" th:href="@{/content/gallery}" class="btn btn-sm btn-primary">去查看</a>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<link th:href="@{/css/bootstrapValidator.min.css}" rel="stylesheet"/>
+<link th:href="@{/css/fileinput.min.css}" rel="stylesheet"/>
+<script th:src="@{/js/bootstrapValidator.min.js}"></script>
+<script th:src="@{/js/fileinput.min.js}"></script>
+<script th:src="@{/js/fileinput_locale_zh.js}"></script>
+<script th:inline="javascript">
+    var prefix = ctx + "content/picAdverts"
+    var prefix1 = ctx + "content/gallery"
+
+    $(function () {
+        //初始化bootstrap校验设置
+        $('#formData').bootstrapValidator({
+            message: '内容不能为空！',
+            feedbackIcons: {
+                valid: 'glyphicon glyphicon-ok',
+                invalid: 'glyphicon glyphicon-remove',
+                validating: 'glyphicon glyphicon-refresh'
+            },
+            fields: {}
+        });
+
+        galleryTypeInit("picAdId");
+    });
+
+    function galleryTypeInit(id) {
+        $.ajax({
+            type: "post",
+            url: prefix + '/cardInfo',
+            success: function (data) {
+                if (data) {
+                    $("#" + id + " option").remove();
+                    var obj = data;
+                    $("#" + id).append("<option value=''>请选择</option>");
+                    for (var i = 0; i < obj.length; i++) {
+                        $("#" + id).append(
+                            "<option value='" + obj[i].picAdId + "'>"
+                            + obj[i].picAdName + "</option>");
+                    }
+                } else {
+                    $.modal.alertWarning("网络异常，请稍后再试！");
+                }
+            }
+        });
+    }
+
+    var fileoptions = {
+        showUpload: false,
+        showRemove: false,
+        language: 'zh',
+        allowedPreviewTypes: ['image'],
+        allowedFileExtensions: ['jpg', 'png', 'gif'],
+        maxFileSize: 0,
+        autoReplace: true,// 是否自动替换图片
+        uploadAsync: false,// 异步上传
+        maxFileCount: 1,
+        maxFilesNum: 1,
+        dropZoneEnabled: false,
+        showPreview: true,
+        msgUploadThreshold: '上传中',
+        msgUploadEnd: '完成'
+    }
+
+    /* 分享图 */
+    var delShareId;
+    $("#shareImgs").fileinput(fileoptions).on("filesuccessremove", function (event, data, msg) {
+        $("#shareImg").val('');
+    }).on("filecleared", function (event, data, msg) {
+        $("#shareImg").val('');
+    }).on("fileclear", function (event, data, msg) {
+        $("#shareImg").val('');
+    }).on('change', function (event) {
+        if (delShareId != null && delShareId != '') {
+            $(this).parents('.col-sm-5').find('.file-preview-thumbnails').empty();
+        }
+    });
+
+    var clickOn = false;
+    //触发提交 先上传附件
+    $("#send").click(function () {
+        if (clickOn) {
+            return false;
+        }
+        var shareImg = $("#shareImgs").val();
+        console.log(shareImg)
+        if (shareImg == "") {
+            $.modal.alertWarning("请先上传图片！");
+            return false;
+        }
+        // 获取表单对象
+        var formData1 = new FormData();
+        formData1.append('imgUrl', $('#shareImgs')[0].files[0]);
+        formData1.append('picAdId', $('#picAdId').val());
+        add(formData1);
+    });
+
+    //提交表单数据
+    function add(formData) {
+        // 显示提示弹框
+        $('#up_showDialog').find('.modal-dialog').css("padding-top", "150px");
+        $('#up_showDialog').modal({
+            keyboard: true,
+            backdrop: 'static'
+        });
+        $.ajax({
+            type: "post",
+            url: prefix1 + '/addGalleryImg',
+            data: formData,
+            processData: false,//不需要对数据进行处理
+            contentType: false,
+            cache: false,
+            dataType: "json",
+            success: function (data) {
+                // 隐藏
+                $('#up_showDialog').modal('hide');
+                if (data.result) {// 跳转到列表页面
+                    $('#successBox').find('.modal-dialog').css({
+                        "padding-top": "150px",
+                        "width": "300px"
+                    });
+                    $('#successBox').modal({
+                        keyboard: true,
+                        backdrop: 'static'
+                    });
+                } else {
+                    clickOn = false;// 置为可点击
+                }
+            }
+        });
+    }
+
+</script>
+</body>
+</html>