Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlArticleContentController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/***
@@ -71,6 +73,10 @@ public class ZjxlArticleContentController extends BaseController {
            articleContent.setArticleContentSubclassify(articleContentSubclassify);
            articleContent.setArticleContentSort(articleContentSort);
            articleContent.setArticleContentIsLine(articleContentIsLine);
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            articleContent.setArticleContentCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
            return write(200,"添加成功","data",articleContentService.addArticleContent(articleContent));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlBannerCnotroller.java

@@ -27,7 +27,9 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -84,6 +86,8 @@ public class ZjxlBannerCnotroller extends BaseController {
        banner.setBannerSort(bannerSort);
        banner.setBannerType(bannerType);
        banner.setBannerTypeUrl(bannerTypeUrl);
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
        banner.setBannerCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
        try {
            logger.info("执行banner添加，参数："+banner);
            return write(200,"添加成功","data",bannerService.addBanner(banner));

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlBasicInfoController.java

@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
/***
 * @ClassName: ZjxlBasicInfoController
 * @Description: 公司基本信息
@@ -40,6 +43,10 @@ public class ZjxlBasicInfoController extends BaseController {
            basicInfo.setBasicInfoEmail(basicInfoEmail);
            basicInfo.setBasicInfoRecord(basicInfoRecord);
            basicInfo.setBasicInfoQrcode(basicInfoQrcode);
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            basicInfo.setBasicInfoCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
            return write(200,"编辑成功","data",basicInfoService.addBasicInfo(basicInfo));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlCompanyCaseController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/***
@@ -71,6 +73,10 @@ public class ZjxlCompanyCaseController extends BaseController {
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
            companyCase.setCompanyTestBannerId(companyTestBannerId);
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            companyCase.setCompanyCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
            return write(200,"添加成功","data",companyCaseService.addCompanyCase(companyCase));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlPartnerController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/***
@@ -61,6 +63,10 @@ public class ZjxlPartnerController extends BaseController {
            partner.setPartnerImg(partnerImg);
            partner.setPartnerSort(partnerSort);
            partner.setPartnerIsLine(partnerIsLine);
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            partner.setPartnerCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
            return write(200,"添加成功","data",partnerService.addPartenr(partner));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlSystemDictController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/***
@@ -64,6 +66,10 @@ public class ZjxlSystemDictController extends BaseController {
            systemDict.setSystemDictSubclassify(systemDictSubclassify);
            systemDict.setSystemDictSort(systemDictSort);
            systemDict.setSystemDictIsLine(systemDictIsLine);
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
            systemDict.setSystemDictCreateTime(df.format(new Date()));// new Date()为获取当前系统时间
            return write(200,"添加成功","data",systemDictService.addSystemDict(systemDict));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlArticleContent.java

@@ -22,6 +22,7 @@ public class ZjxlArticleContent {
    private String articleContentSubclassify;
    private Integer articleContentSort;
    private Integer articleContentIsLine;
    private String articleContentCreateTime;
    @Id
    public String getArticleContentId() {
@@ -95,4 +96,12 @@ public class ZjxlArticleContent {
    public void setArticleContentIsLine(Integer articleContentIsLine) {
        this.articleContentIsLine = articleContentIsLine;
    }
    public String getArticleContentCreateTime() {
        return articleContentCreateTime;
    }
    public void setArticleContentCreateTime(String articleContentCreateTime) {
        this.articleContentCreateTime = articleContentCreateTime;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlBanner.java

@@ -30,6 +30,8 @@ public class ZjxlBanner {
    private Integer bannerIsLine;
    private String bannerCreateTime;
    @Id
    public String getBannerId() {
        return bannerId;
@@ -86,4 +88,12 @@ public class ZjxlBanner {
    public void setBannerIsLine(Integer bannerIsLine) {
        this.bannerIsLine = bannerIsLine;
    }
    public String getBannerCreateTime() {
        return bannerCreateTime;
    }
    public void setBannerCreateTime(String bannerCreateTime) {
        this.bannerCreateTime = bannerCreateTime;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlBasicInfo.java

@@ -19,6 +19,7 @@ public class ZjxlBasicInfo {
    private String basicInfoEmail;
    private String basicInfoRecord;//备案信息
    private String basicInfoQrcode;//二维码
    private String basicInfoCreateTime;
    @Id
    public String getBasicInfoId() {
@@ -68,4 +69,12 @@ public class ZjxlBasicInfo {
    public void setBasicInfoQrcode(String basicInfoQrcode) {
        this.basicInfoQrcode = basicInfoQrcode;
    }
    public String getBasicInfoCreateTime() {
        return basicInfoCreateTime;
    }
    public void setBasicInfoCreateTime(String basicInfoCreateTime) {
        this.basicInfoCreateTime = basicInfoCreateTime;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlCompanyCase.java

@@ -34,6 +34,8 @@ public class ZjxlCompanyCase {
    private String companyTestBannerId;
    private String companyCreateTime;
    @Id
    public String getCompanyId() {
        return companyId;
@@ -114,4 +116,12 @@ public class ZjxlCompanyCase {
    public void setCompanyTestBannerId(String companyTestBannerId) {
        this.companyTestBannerId = companyTestBannerId;
    }
    public String getCompanyCreateTime() {
        return companyCreateTime;
    }
    public void setCompanyCreateTime(String companyCreateTime) {
        this.companyCreateTime = companyCreateTime;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlPartner.java

@@ -18,6 +18,7 @@ public class ZjxlPartner {
    private String partnerImg;
    private Integer partnerSort;
    private Integer partnerIsLine;
    private String partnerCreateTime;
    @Id
    public String getPartnerId() {
@@ -59,4 +60,12 @@ public class ZjxlPartner {
    public void setPartnerIsLine(Integer partnerIsLine) {
        this.partnerIsLine = partnerIsLine;
    }
    public String getPartnerCreateTime() {
        return partnerCreateTime;
    }
    public void setPartnerCreateTime(String partnerCreateTime) {
        this.partnerCreateTime = partnerCreateTime;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/model/ZjxlSystemDict.java

@@ -19,6 +19,7 @@ public class ZjxlSystemDict {
    private String systemDictSubclassify;
    private Integer systemDictSort;
    private Integer systemDictIsLine;
    private String systemDictCreateTime;
    @Id
    public String getSystemDictId() {
@@ -68,4 +69,12 @@ public class ZjxlSystemDict {
    public void setSystemDictIsLine(Integer systemDictIsLine) {
        this.systemDictIsLine = systemDictIsLine;
    }
    public String getSystemDictCreateTime() {
        return systemDictCreateTime;
    }
    public void setSystemDictCreateTime(String systemDictCreateTime) {
        this.systemDictCreateTime = systemDictCreateTime;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlArticleContentService.java

@@ -39,7 +39,7 @@ public class ZjxlArticleContentService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and article_content_type = "+systemDictType+"";
        }
        sql += " order by article_content_sort desc limit "+page+" , "+pagesiz+"";
        sql += " order by article_content_sort,article_content_create_time desc limit "+page+" , "+pagesiz+"";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }
@@ -79,7 +79,7 @@ public class ZjxlArticleContentService extends BaseService {
    }
    public List<ZjxlArticleContent> getArticleContent(String articleContentType,String articleContentClassify,String articleContentSubclassify){
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" and article_content_classify = '"+articleContentClassify+"' and article_content_subclassify = '"+articleContentSubclassify+"' order by article_content_sort desc limit 1";
        String sql = "select * from zjxl_article_content where article_content_type = "+articleContentType+" and article_content_classify = '"+articleContentClassify+"' and article_content_subclassify = '"+articleContentSubclassify+"' order by article_content_sort,article_content_create_time desc limit 1";
        List<ZjxlArticleContent> articleContentList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlArticleContent.class));
        return articleContentList;
    }

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlBannerService.java

@@ -41,7 +41,7 @@ public class ZjxlBannerService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " AND banner_name LIKE '%"+name+"%'";
        }
        sql += " ORDER BY banner_sort DESC LIMIT "+page+" , "+pagesize+" ";
        sql += " ORDER BY banner_sort,banner_create_time DESC LIMIT "+page+" , "+pagesize+" ";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
       return bannerList;
    }

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlCompanyCaseService.java

@@ -37,7 +37,7 @@ public class ZjxlCompanyCaseService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " and company_name = '"+name+"'";
        }
        sql += " order by company_sort desc limit "+page+" , "+pagesize+"";
        sql += " order by company_sort,company_create_time desc limit "+page+" , "+pagesize+"";
        List<ZjxlCompanyCase> companyCaseList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlCompanyCase.class));
        return companyCaseList;
    }

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlPartnerService.java

@@ -36,7 +36,7 @@ public class ZjxlPartnerService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " and partner_name like '%"+name+"%'";
        }
        sql += " order by partner_sort desc limit "+page+" , "+pagesize+"";
        sql += " order by partner_sort,partner_create_time desc limit "+page+" , "+pagesize+"";
        List<ZjxlPartner> partnerList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return partnerList;
    }

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlSystemDictService.java

@@ -41,7 +41,7 @@ public class ZjxlSystemDictService extends BaseService {
        if (systemDictType != null && systemDictType > 0){
            sql += " and system_dict_type = "+systemDictType+"";
        }
        sql += " order by system_dict_sort desc limit "+page+" , "+pagesize+"";
        sql += " order by system_dict_sort,system_dict_create_time desc limit "+page+" , "+pagesize+"";
        List<ZjxlSystemDict> systemDictList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlSystemDict.class));
        return systemDictList;
    }