diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java index 6de0cbd01..9abf1ddaa 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java @@ -7,11 +7,16 @@ package com.ruoyi.content.constants; */ public class PropertiesConstants { - public static final String TEMPLATE_VIEW_PATH = "/WEB-INF/static/template/view.flt"; - public static final String TEMPLATE_EDIT_PATH = "/WEB-INF/static/template/edit.flt"; +// public static final String TEMPLATE_VIEW_PATH = "/WEB-INF/static/template/view.flt"; +// public static final String TEMPLATE_EDIT_PATH = "/WEB-INF/static/template/edit.flt"; +// +// public static final String FILE_PATH = "/app/contentMKTCms/webapp/WEB-INF/static/"; +// public static final String PROJECT_LOCALPATH = "/app/contentMKTCms/webapp"; + public static final String TEMPLATE_VIEW_PATH = "view.flt"; + public static final String TEMPLATE_EDIT_PATH = "edit.flt"; - public static final String FILE_PATH = "/app/contentMKTCms/webapp/WEB-INF/static/"; - public static final String PROJECT_LOCALPATH = "/app/contentMKTCms/webapp"; + public static final String FILE_PATH = "/Users/liushenlu/Desktop/"; + public static final String PROJECT_LOCALPATH = "/Users/liushenlu/Desktop"; public static final String ONLINE_IMG_PATH = "network/article/"; public static final String OSS_URL = "http://cdn.sinosoftec.com/"; public static final String OSS_URL_HTTPS = "https://cdn.sinosoftec.com/"; diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java index 4d1dc1447..348c9d124 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java @@ -6,7 +6,9 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.content.domain.ArticleAdInfo; import com.ruoyi.content.domain.CmsArticleAdInfo; +import com.ruoyi.content.message.Message; import com.ruoyi.content.service.ICmsArticleAdInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +16,9 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; /** * 文章广告Controller @@ -36,6 +40,30 @@ public class AdvertisementController extends BaseController { return prefix + "/adverts"; } + /** + * 查询所有广告列表（本程序调用） + * + * @param request + * @param response + * @return + */ + @RequestMapping("/queryAdvertisements") + @ResponseBody + public Message queryAdvertisements(HttpServletRequest request, HttpServletResponse response) { + response.setHeader("Access-Control-Allow-Origin", "*"); + Thread.currentThread().setName(UUID.randomUUID().toString()); + Message msg = new Message(); + Map adMap = new HashMap<>(); + String companyId = "1"; + // 广告列表信息 + List advertiseAdList = cmsArticleAdInfoService.queryAdByCompanyId(companyId); + adMap.put("advertiseAdList", advertiseAdList); + msg.setInfo("成功"); + msg.setObject(adMap); + msg.setResult(true); + return msg; + } + /** * 查询文章广告列表 */ diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java index c489332e2..c3d3ff2dd 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java @@ -151,13 +151,15 @@ public class ArticleManageController extends BaseController { Thread.currentThread().setName(UUID.randomUUID().toString()); Message msg = new Message(); logger.info("通过文章链接获取文章内容控制层方法开始"); - String createUser = request.getParameter("createUser"); +// String createUser = request.getParameter("createUser"); + String createUser = "13152783264"; if (StringUtils.isBlank(createUser)) { logger.info("用户已离线"); throw new BusinessException("通过文章链接获取文章内容,用户已离线"); } String originalUrl = request.getParameter("originalUrl"); // 文章连接,如果是通过连接导入文章,则必传 - String author = request.getParameter("author"); // 作者 +// String author = request.getParameter("author"); // 作者 + String author = "13152783264"; String ids = request.getParameter("ids"); // 广告ids String isAuthorization = request.getParameter("isAuthorization"); // 是否授权 String isReserve = request.getParameter("isReserve"); // 是否预约 diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java index 398763425..72ae5809a 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.content.domain.BaseCode; import com.ruoyi.content.domain.BaseCodeTree; +import com.ruoyi.content.domain.ZtreeDto; import com.ruoyi.content.message.Message; import com.ruoyi.content.service.BaseCodeService; import com.ruoyi.content.utils.DateUtil; @@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.Serializable; import java.util.*; /** @@ -68,12 +68,11 @@ public class BaseCodeController extends BaseController { * 添加栏目 * * @param request - * @param response * @return */ @RequestMapping("/addColumn") @ResponseBody - public Message addColumn(HttpServletRequest request, HttpServletResponse response) { + public Message addColumn(HttpServletRequest request) { logger.info("进入新建栏目控制层方法"); Message msg = new Message(); Thread.currentThread().setName(UUID.randomUUID().toString()); @@ -115,12 +114,11 @@ public class BaseCodeController extends BaseController { * 更新栏目信息 * * @param request - * @param response * @return */ @RequestMapping("/updateColumn") @ResponseBody - public Message updateColumn(HttpServletRequest request, HttpServletResponse response) { + public Message updateColumn(HttpServletRequest request) { logger.info("进入更新栏目控制层方法"); Message msg = new Message(); Thread.currentThread().setName(UUID.randomUUID().toString()); @@ -166,12 +164,11 @@ public class BaseCodeController extends BaseController { * 修改栏目信息 * * @param request - * @param response * @return */ @RequestMapping("/changeState") @ResponseBody - public Message changeState(HttpServletRequest request, HttpServletResponse response) { + public Message changeState(HttpServletRequest request) { logger.info("进入修改栏目状态栏目控制层方法"); Message msg = new Message(); Thread.currentThread().setName(UUID.randomUUID().toString()); @@ -220,8 +217,7 @@ public class BaseCodeController extends BaseController { Message msg = new Message(); Map policyMap = new HashMap(); // 银行列表信息 - List bankList = new ArrayList(); - bankList = baseCodeService.queryBaseCodeByType(basicType); + List bankList = baseCodeService.queryBaseCodeByType(basicType); policyMap.put("baseList", bankList); msg.setInfo("成功"); msg.setObject(policyMap); @@ -232,14 +228,12 @@ public class BaseCodeController extends BaseController { /** * 获取栏目全部信息 * - * @param request * @param response * @return - * @throws Exception */ @RequestMapping(value = "/queryColumn") @ResponseBody - public Message getColumn(HttpServletRequest request, HttpServletResponse response) throws Exception { + public Message getColumn(HttpServletResponse response) { response.setHeader("Access-Control-Allow-Origin", "*"); Message msg = new Message(); Map policyMap = new HashMap(); @@ -262,148 +256,57 @@ public class BaseCodeController extends BaseController { */ @RequestMapping(value = "/columnTree") @ResponseBody - public List columnTree(HttpServletRequest request, HttpServletResponse response) throws Exception { + public List columnTree(HttpServletRequest request, HttpServletResponse response) { response.setHeader("Access-Control-Allow-Origin", "*"); - Message msg = new Message(); - Map policyMap = new HashMap(); String codeCode = request.getParameter("codeCode"); String codeType = request.getParameter("codeType"); String flag = request.getParameter("flag"); // 查询栏目树 - List columnList = baseCodeService.columnTree(codeCode, codeType); -// policyMap.put("columnList", columnList); -// msg.setInfo("成功"); -// msg.setObject(policyMap); -// msg.setResult(true); + List columnList = baseCodeService.columnTree(codeCode, codeType); return initZtree(columnList, flag); } - public List initZtree(List deptList, String flag) { + /** + * 获取栏目树 + * + * @param request + * @param response + * @return + * @throws Exception + */ + @RequestMapping(value = "/columnTrees") + @ResponseBody + public List columnTrees(HttpServletRequest request, HttpServletResponse response) { + response.setHeader("Access-Control-Allow-Origin", "*"); + String codeCode = request.getParameter("codeCode"); + String codeType = request.getParameter("codeType"); + String flag = request.getParameter("flag"); + // 查询栏目树 + List columnList = baseCodeService.columnTrees(codeCode, codeType); - List ztreeList = new ArrayList<>(); + return initZtree(columnList, flag); + } + + public List initZtree(List deptList, String flag) { if (deptList != null && deptList.size() > 0) { if (StringUtils.isBlank(flag)) { - Ztree z = new Ztree(); + ZtreeDto z = new ZtreeDto(); z.setId("FIRST_COLUMN"); z.setpId(""); z.setName("栏目"); z.setTitle("栏目"); - ztreeList.add(z); + deptList.add(z); } else if (StringUtils.equals(flag, "1")) { - Ztree z = new Ztree(); + ZtreeDto z = new ZtreeDto(); z.setId("ARTICLE"); z.setpId(""); z.setName("文库"); z.setTitle("文库"); - ztreeList.add(z); - } - for (BaseCodeTree dept : deptList) { - Ztree ztree = new Ztree(); - ztree.setId(dept.getCodeCode()); - ztree.setpId(dept.getCodeType()); - ztree.setName(dept.getCodeCname()); - ztree.setTitle(dept.getCodeCname()); - ztreeList.add(ztree); + deptList.add(z); } } - return ztreeList; - } - - static class Ztree implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 节点ID - */ - private String id; - - /** - * 节点父ID - */ - private String pId; - - /** - * 节点名称 - */ - private String name; - - /** - * 节点标题 - */ - private String title; - - /** - * 是否勾选 - */ - private boolean checked = false; - - /** - * 是否展开 - */ - private boolean open = false; - - /** - * 是否能勾选 - */ - private boolean nocheck = false; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getpId() { - return pId; - } - - public void setpId(String pId) { - this.pId = pId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public boolean isChecked() { - return checked; - } - - public void setChecked(boolean checked) { - this.checked = checked; - } - - public boolean isOpen() { - return open; - } - - public void setOpen(boolean open) { - this.open = open; - } - - public boolean isNocheck() { - return nocheck; - } - - public void setNocheck(boolean nocheck) { - this.nocheck = nocheck; - } + return deptList; } /** diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java new file mode 100644 index 000000000..010f7eac6 --- /dev/null +++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java @@ -0,0 +1,107 @@ +package com.ruoyi.content.domain; + +import java.io.Serializable; + +/** + * @program: ruoyi->ZtreeDto + * @description: + * @author: LiuShenlu + * @create: 2021-03-31 10:16 + **/ +public class ZtreeDto implements Serializable { + + + private static final long serialVersionUID = 1L; + + /** + * 节点ID + */ + private String id; + + /** + * 节点父ID + */ + private String pId; + + /** + * 节点名称 + */ + private String name; + + /** + * 节点标题 + */ + private String title; + + /** + * 是否勾选 + */ + private boolean checked = false; + + /** + * 是否展开 + */ + private boolean open = false; + + /** + * 是否能勾选 + */ + private boolean nocheck = false; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + + public boolean isOpen() { + return open; + } + + public void setOpen(boolean open) { + this.open = open; + } + + public boolean isNocheck() { + return nocheck; + } + + public void setNocheck(boolean nocheck) { + this.nocheck = nocheck; + } + +} diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java index a5afb23b1..8ba558720 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.content.mapper; import com.ruoyi.content.domain.BaseCode; import com.ruoyi.content.domain.BaseCodeTree; +import com.ruoyi.content.domain.ZtreeDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -23,4 +24,7 @@ public interface BaseCodeExMapper { public List getNextNodeTree(HashMap parMap); + List columnTrees(HashMap parMap); + + List getNextNodeTrees(HashMap map); } \ No newline at end of file diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java index 02f8ecb65..e5f70772f 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java @@ -2,6 +2,7 @@ package com.ruoyi.content.service; import com.ruoyi.content.domain.BaseCode; import com.ruoyi.content.domain.BaseCodeTree; +import com.ruoyi.content.domain.ZtreeDto; import com.ruoyi.content.message.Message; import java.util.List; @@ -87,7 +88,7 @@ public interface BaseCodeService { * @param codeType * @return */ - public List columnTree(String codeCode, String codeType); + public List columnTree(String codeCode, String codeType); /** * 操作栏目排序 @@ -106,4 +107,5 @@ public interface BaseCodeService { */ List baseColumnTree(String codeCode); + List columnTrees(String codeCode, String codeType); } diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java index 2246f7991..cc1bc32ad 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java @@ -2,6 +2,7 @@ package com.ruoyi.content.service; import java.util.List; +import com.ruoyi.content.domain.ArticleAdInfo; import com.ruoyi.content.domain.CmsArticleAdInfo; import org.springframework.web.multipart.MultipartFile; @@ -61,4 +62,6 @@ public interface ICmsArticleAdInfoService { * @return 结果 */ public int deleteCmsArticleAdInfoById(Long adId); + + List queryAdByCompanyId(String companyId); } diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java index 49805a60f..1097ef2bd 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.content.service.impl; import com.ruoyi.content.domain.BaseCode; import com.ruoyi.content.domain.BaseCodeExample; import com.ruoyi.content.domain.BaseCodeTree; +import com.ruoyi.content.domain.ZtreeDto; import com.ruoyi.content.exception.ParameterException; import com.ruoyi.content.mapper.BaseCodeExMapper; import com.ruoyi.content.mapper.BaseCodeMapper; @@ -31,6 +32,17 @@ import java.util.Set; @Service public class BaseCodeServiceImpl implements BaseCodeService { private static final Logger logger = LoggerFactory.getLogger(BaseCodeServiceImpl.class); + + static List columnList = new ArrayList<>(); + + static { + columnList.add("INCREASE_ARTICLE"); + columnList.add("ARTICLE"); + columnList.add("GALLERY"); + columnList.add("FIRST_COLUMN"); + columnList.add("INCREASE_GALLERY"); + } + @Autowired private BaseCodeMapper baseCodeMapper; @Autowired @@ -350,6 +362,7 @@ public class BaseCodeServiceImpl implements BaseCodeService { logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType); redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType); } + recursionDelete(baseCode); logger.info("成功删除栏目状态！"); } else { logger.info("删除栏目状态失败！"); @@ -370,6 +383,25 @@ public class BaseCodeServiceImpl implements BaseCodeService { return 1; } + private void recursionDelete(BaseCode baseCode) { + if (!columnList.contains(baseCode.getCodeType())) { + return; + } + BaseCodeExample example = new BaseCodeExample(); + example.createCriteria().andCodeTypeEqualTo(baseCode.getCodeCode()); + List baseCodeList = baseCodeMapper.selectByExample(example); + if (baseCodeList != null && baseCodeList.size() > 0) { + for (BaseCode base : baseCodeList) { + //标志位0:有效1:无效;2删除 + base.setState("2"); + base.setUpdateTime(DateUtil.getDate()); + base.setUpdateUser(""); + baseCodeMapper.updateByPrimaryKeySelective(base); + recursionDelete(base); + } + } + } + /** * 分页查询栏目信息 */ @@ -454,45 +486,35 @@ public class BaseCodeServiceImpl implements BaseCodeService { } @Override - public List columnTree(String codeCode, String codeType) { + public List columnTree(String codeCode, String codeType) { logger.info("进入查询栏目树的方法"); - if (StringUtils.isAllBlank(codeCode, codeType)) { - logger.info("查询栏目树请求参数不正确codeCode【{}】", codeCode); - throw new ParameterException("创建失败，参数不足！"); - } - List list = null; - String companyId = "1"; String branchId = "86"; String state = "0"; - HashMap parMap = new HashMap(); + HashMap parMap = new HashMap<>(); parMap.put("codeCode", codeCode); - parMap.put("companyId", companyId); + parMap.put("companyId", "1"); parMap.put("state", state); parMap.put("codeType", codeType); if (!"86".equals(branchId)) { parMap.put("branchId", branchId); } - list = baseCodeExMapper.columnTree(parMap); - List baseCodeList = new ArrayList<>(); - if (list != null && list.size() > 0) { - recursion(list, baseCodeList); - } + List list = baseCodeExMapper.columnTrees(parMap); logger.info("查询栏目树结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list)); logger.info("查询栏目信息的方法结束！"); - return baseCodeList; + return list; } - private void recursion(List baseCodeList, List list1) { - for (BaseCodeTree baseCode : baseCodeList) { + private void recursion(List baseCodeList, List list1, String companyId, String state, String branchId) { + for (ZtreeDto baseCode : baseCodeList) { HashMap map = new HashMap(); - map.put("CODE_CODE", baseCode.getCodeCode()); - map.put("parentCompanyId", baseCode.getCompanyId()); - map.put("parentState", baseCode.getState()); - map.put("parentBranchId", baseCode.getBranchId()); - List list = baseCodeExMapper.getNextNodeTree(map); + map.put("CODE_CODE", baseCode.getId()); + map.put("parentCompanyId", companyId); + map.put("parentState", state); + map.put("parentBranchId", branchId); + List list = baseCodeExMapper.getNextNodeTrees(map); list1.add(baseCode); if (list != null && list.size() > 0) { - recursion(list, list1); + recursion(list, list1, companyId, state, branchId); } } } @@ -587,6 +609,26 @@ public class BaseCodeServiceImpl implements BaseCodeService { return msg; } + @Override + public List columnTrees(String codeCode, String codeType) { + logger.info("进入查询栏目树的方法"); + String branchId = "86"; + String state = "0"; + HashMap parMap = new HashMap<>(); + parMap.put("codeCode", codeCode); + parMap.put("companyId", "1"); + parMap.put("state", state); + parMap.put("codeType", codeType); + if (!"86".equals(branchId)) { + parMap.put("branchId", branchId); + } + List list = baseCodeExMapper.columnTrees(parMap); + List list1 = new ArrayList<>(); + recursion(list, list1, "1", state, branchId); + logger.info("查询栏目信息的方法结束！"); + return list1; + } + @Override public List baseColumnTree(String codeCode) { logger.info("进入查询栏目树的方法"); diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java index 6c98c2d13..a69a19028 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java @@ -2,7 +2,9 @@ package com.ruoyi.content.service.impl; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.content.constants.PropertiesConstants; +import com.ruoyi.content.domain.ArticleAdInfo; import com.ruoyi.content.domain.CmsArticleAdInfo; +import com.ruoyi.content.mapper.ArticleAdQueryMapper; import com.ruoyi.content.mapper.CmsArticleAdInfoMapper; import com.ruoyi.content.redis.RedisManager; import com.ruoyi.content.service.ICmsArticleAdInfoService; @@ -14,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.ArrayList; import java.util.List; /** @@ -30,6 +33,8 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService { @Autowired private CmsArticleAdInfoMapper cmsArticleAdInfoMapper; @Autowired + private ArticleAdQueryMapper articleAdQueryMapper; + @Autowired private RedisManager redisManager; /** @@ -171,4 +176,12 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService { public int deleteCmsArticleAdInfoById(Long adId) { return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoById(adId); } + + @Override + public List queryAdByCompanyId(String companyId) { + LOGGER.info("获取到的公司companyId[{}]",companyId); + List adList = articleAdQueryMapper.queryAdByCompanyId(companyId); + LOGGER.info("该公司查询到的广告【{}】", adList.size()); + return adList; + } } diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml index 873e61a1d..1acb8aaf7 100644 --- a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml +++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml @@ -120,5 +120,50 @@ order by ORDER_NO*1,CREATE_TIME + + + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html index d16627776..8e887db33 100644 --- a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html +++ b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html @@ -44,7 +44,7 @@ 添加 - + 删除 diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html index 5f02fa4bb..8056d2f94 100644 --- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html +++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html @@ -49,10 +49,10 @@ 批量收录 - + 批量移除 - + 创建文章 @@ -180,6 +180,72 @@ + @@ -371,6 +437,9 @@ cloumnTreeInit(); ldcomList(); + advertisementTypeInit(); + labelTypeInit(); + layui.use('laydate', function () { var laydate = layui.laydate; @@ -590,7 +659,7 @@ //移除绑定事件 $('#sure').unbind('click'); $('#myModal1').modal('show'); - const url = ctx + "column/columnTree?codeType=ARTICLE&flag=1"; + const url = ctx + "column/columnTrees?codeType=ARTICLE&flag=1"; let options = { url: url, expandLevel: 1, // 展开等级节点 @@ -939,27 +1008,188 @@ function loadPreviewData(id) { $.ajax({ - url : prefix + "/preview", - data : { - "publishId" : id + url: prefix + "/preview", + data: { + "publishId": id }, - dataType : "json", - type : "post", - cache : false, - success : function(data) { + dataType: "json", + type: "post", + cache: false, + success: function (data) { if (data.result) { $.modal.open('文章预览', data.object.editUrl) - }else{ + } else { $.modal.alertError("预览失败，请稍后重试！"); } }, - error : function(textStatus, e) { + error: function (textStatus, e) { $.modal.alertError('系统异常,请稍后重试!'); } }); } + //广告列表初始化 + function advertisementTypeInit() { + $.ajax({ + type: "post", + url: path + 'content/adverts/queryAdvertisements', + data: {}, + async: false, + success: function (data) { + if (data.result) { + let obj = data.object.advertiseAdList; + for (let i = 0; i < obj.length; i++) { + if (i > 0) { + if (obj[i].adTypeName == obj[i - 1].adTypeName) { + $("#advertisementTypeInit").append( + ""); + } else { + // 除了名片的其他类型都按类型名显示 + $("#advertisementTypeInit").append( + ""); + $("#advertisementTypeInit").append( + ""); + } + } else { + $("#advertisementTypeInit").append( + ""); + $("#advertisementTypeInit").append( + ""); + } + } + } else { + $.modal.alertError("网络异常，请稍后再试！"); + } + } + }); + } + + /* 查询标签信息 */ + function labelTypeInit() { + $.ajax({ + type: "post", + url: path + 'label/queryLabel', + data: {}, + async: false, + success: function (data) { + if (data.result) { + var obj = data.object.labelList; + $("#labelTypeInit").append( + ""); + for (var i = 0; i < obj.length; i++) { + $("#LABEL").append( + ""); + + } + } else { + $.modal.alertError("网络异常，请稍后再试！"); + } + } + }); + } + + function importArticle() { + let ids = []; + let labelIds = []; + let length = $("#advertisementTypeInit option:selected").length; + if (length > 1) { + $.modal.alertError("请选择一条广告!") + return false; + } + $("#advertisementTypeInit option:selected").each(function () { + ids.push($(this).val()) + }) + $("#labelTypeInit option:selected").each(function () { + labelIds.push($(this).val()) + }) + let email = $("#email").val(); + let isWarrant = $("#isAuthorization").prop('checked'); + let isReservation = $("#isReserve").prop('checked'); + let isAddActive = $("#isJoinActive").prop('checked'); + if (isWarrant) { // 1授权 0未授权 + var isAuthorization = "1"; + } else { + var isAuthorization = "0"; + } + + let automaticName = ""; + let introduction = ""; + + if (isReservation) { // 1预约 0不预约 + var isReserve = "1"; + if (automaticName == '' || introduction == '') { + $.modal.alertError('您填写的按钮名称或预约介绍为空，请重新输入'); + return; + } + } else { + + var isReserve = "0"; + } + if (isAddActive) {//1添加活动0不添加 + var isJoinActive = "1"; + } else { + var isJoinActive = "0"; + } + + let originalUrl = $("#ccomment").val(); + // if (originalUrl.indexOf("mp.weixin.qq.com") == -1) { + // $.modal.alertError("文章链接格式不正确！应为微信文章链接"); + // return; + // } + $('#myModal4').modal('hide'); + $.modal.loading("导入中请等待。。。"); + $.ajax({ + url: path + "article/getArticleContentByUrl", + data: { + 'author': email, + 'createUser': email, + 'ids': ids.join(','), + 'isAuthorization': isAuthorization, + 'isReserve': isReserve, + 'automaticName': automaticName, + 'introduction': introduction, + 'labelIds': labelIds.join(','), + 'isJoinActive': isJoinActive, + 'originalUrl': originalUrl + }, + type: "post", + success: function (data) { + $.modal.closeLoading(); + if (data.result) { + debugger + localStorage.setItem("nryx_articleContent", data.object.articleContent); // 文章内容 + localStorage.setItem("nryx_originalUrl", data.object.originalUrl); // 文章链接 + // //文章名称 + localStorage.setItem("nryx_articleName", data.object.articleName); // 文章名称 + localStorage.setItem("nryx_shareImgUrl", data.object.shareImgUrl); // 文章分享图片 + // //文章分享标题 + localStorage.setItem("nryx_shareTitle", data.object.shareTitle); // 文章分享标题 + localStorage.setItem("nryx_shareDes", data.object.shareDes); // 文章分享描述 + localStorage.setItem("nryx_listPicUrl", data.object.listPicUrl); // 文章列表展示图片 + localStorage.setItem("nryx_adId", data.object.adId); // 广告id + localStorage.setItem("nryx_isAuthorization", data.object.isAuthorization); // 是否授权 + localStorage.setItem("nryx_isJoinActive", data.object.isJoinActive); // 是否添加优选活动 + localStorage['nryx_editahref'] = data.object.articleEditUrl; + $.table.refresh(); + $.modal.open('创建文章', localStorage['nryx_editahref']) + } else { + $.modal.alertError(data.info) + } + }, + error: function () { + $.modal.closeLoading(); + } + }); + }; + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html index 71bd113ea..cd36f518c 100644 --- a/ruoyi-content/src/main/resources/templates/content/column/column.html +++ b/ruoyi-content/src/main/resources/templates/content/column/column.html @@ -270,7 +270,7 @@ }); function queryColumnTree() { - var url = ctx + "column/columnTree?codeType=FIRST_COLUMN"; + var url = ctx + "column/columnTree"; var options = { url: url, expandLevel: 1, @@ -654,7 +654,6 @@ // 编辑后保存操作 function editColum() { - debugger let id = $('#asdid').val(); let rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', id); let cName = $("#cName").val(); diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html b/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html index 9becb9df5..024e8a310 100644 --- a/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html +++ b/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html @@ -70,7 +70,7 @@
恭喜，创建成功！
继续创建 - 去查看 + 去查看
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/list.html b/ruoyi-content/src/main/resources/templates/content/gallery/list.html index dea24f37b..384017c3f 100644 --- a/ruoyi-content/src/main/resources/templates/content/gallery/list.html +++ b/ruoyi-content/src/main/resources/templates/content/gallery/list.html @@ -39,7 +39,7 @@ diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html index 422067c28..90ad2a20e 100644 --- a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html +++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html @@ -29,7 +29,7 @@ 添加 - + 删除