Skip to content

M
midjourney-proxy
Commit 9e24a4d6 by lili
Options

加上过滤测试数据

parent ed940b11
Showing with 300 additions and 300 deletions
pcloud-service-book/src/main/java/com/pcloud/book/appeal/facade/impl/BookAppealFacadeImpl.java
package com.pcloud.book.appeal.facade.impl;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.appeal.biz.BookAppealBiz;
import com.pcloud.book.appeal.dto.BookAppealDto;
import com.pcloud.book.appeal.entity.BookAppeal;
......@@ -25,9 +11,19 @@ import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageParam;
import com.pcloud.common.permission.Permission;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.permission.PermissionCode.ServerPermissionCode;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.ws.rs.Consumes;
import javax.ws.rs.core.MediaType;
/**
* 书刊申诉接口实现
......@@ -39,8 +35,6 @@ import com.pcloud.common.utils.SessionUtil;
*/
@RequestMapping("/bookAppeal")
@RestController("bookAppealFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookAppealFacadeImpl implements BookAppealFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
......@@ -1214,7 +1214,7 @@ public class BookBizImpl implements BookBiz {
paramMap.put("templeIds",ids);
}
}
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookClassify");
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookClassify", "listBookClassifyCount");
if (pageBean != null) {
// 设置编辑名称
bookSet.setAdviserName4BookDto(pageBean.getRecordList());
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAdviserFacadeImpl.java
......@@ -3,23 +3,6 @@
*/
package com.pcloud.book.book.facade.impl;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.base.dto.CountDto;
import com.pcloud.book.book.biz.BookAdviserBiz;
import com.pcloud.book.book.dto.AdviserManageDto;
......@@ -31,6 +14,17 @@ import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @描述：顾问书籍管理接口实现类
......@@ -39,8 +33,6 @@ import com.pcloud.common.utils.SessionUtil;
*/
@RequestMapping("/bookAdviser")
@RestController("bookAdviserFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookAdviserFacadeImpl implements BookAdviserFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAppFacadeImpl.java
......@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.base.dto.CountDto;
import com.pcloud.book.book.biz.BookAppBiz;
import com.pcloud.book.book.dto.BookAppDto;
......@@ -40,8 +39,6 @@ import com.pcloud.common.utils.cookie.Cookie;
*/
@RequestMapping("/bookApp")
@RestController("bookAppFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookAppFacadeImpl implements BookAppFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAssistTempletFacadeImpl.java
package com.pcloud.book.book.facade.impl;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.codehaus.jackson.JsonParseException;
import com.pcloud.book.book.biz.BookAssistTempletBiz;
import com.pcloud.book.book.facade.BookAssistTempletFacade;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.biz.BookAssistTempletBiz;
import com.pcloud.book.book.entity.BookAssistTemplet;
import com.pcloud.book.book.facade.BookAssistTempletFacade;
import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.SessionUtil;
/**
* 书刊模板分类
* @author MICHAEL
......@@ -33,8 +12,6 @@ import com.pcloud.common.utils.SessionUtil;
*/
@RequestMapping("/bookAssistTemplet")
@RestController("bookAssistTempletFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookAssistTempletFacadeImpl implements BookAssistTempletFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
......@@ -3,7 +3,6 @@
*/
package com.pcloud.book.book.facade.impl;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.google.common.collect.Lists;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.biz.BookBiz;
......@@ -33,9 +32,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -48,8 +44,6 @@ import java.util.Map;
*/
@RequestMapping("/book")
@RestController("bookFacade")
@Produces({ContentType.APPLICATION_JSON_UTF_8})
@Consumes({MediaType.APPLICATION_JSON})
public class BookFacadeImpl implements BookFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFreezeFacadeImpl.java
package com.pcloud.book.book.facade.impl;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.book.biz.BookFreezeBiz;
import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.entity.BookFreeze;
......@@ -11,7 +10,6 @@ import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import com.pcloud.common.utils.cookie.Cookie;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CookieValue;
......@@ -34,8 +32,6 @@ import javax.ws.rs.core.MediaType;
*/
@RequestMapping("/bookFreeze")
@RestController("bookFreezeFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookFreezeFacadeImpl implements BookFreezeFacade {
@Autowired
private BookFreezeBiz bookFreezeBiz;
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFundFacadeImpl.java
package com.pcloud.book.book.facade.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.book.biz.BookFundBiz;
import com.pcloud.book.book.dto.BookFundDto;
import com.pcloud.book.book.entity.BookFund;
......@@ -28,6 +10,18 @@ import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageParam;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @描述：书刊基金接口实现层
......@@ -36,8 +30,6 @@ import com.pcloud.common.utils.SessionUtil;
*/
@RequestMapping("/bookFund")
@RestController("bookFundFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookFundFacadeImpl implements BookFundFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookProductFacadeImpl.java
......@@ -3,24 +3,6 @@
*/
package com.pcloud.book.book.facade.impl;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.base.dto.CountDto;
import com.pcloud.book.book.biz.BookProductBiz;
import com.pcloud.book.book.dto.BookProductDto;
......@@ -31,6 +13,18 @@ import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import com.pcloud.common.utils.cookie.Cookie;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @描述：
......@@ -40,8 +34,6 @@ import com.pcloud.common.utils.cookie.Cookie;
*/
@RequestMapping("/bookProduct")
@RestController("bookProductFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookProductFacadeImpl implements BookProductFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookResourceFacadeImpl.java
......@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.base.dto.CountDto;
import com.pcloud.book.book.biz.BookResourceBiz;
import com.pcloud.book.book.dto.BookDto;
......@@ -40,8 +39,6 @@ import com.pcloud.common.utils.cookie.Cookie;
*/
@RequestMapping("/bookResource")
@RestController("bookResourceFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookResourceFacadeImpl implements BookResourceFacade {
@Autowired
private BookResourceBiz bookResourceBiz;
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookTypeFacadeImpl.java
......@@ -3,22 +3,6 @@
*/
package com.pcloud.book.book.facade.impl;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
import com.pcloud.book.book.biz.BookTypeBiz;
import com.pcloud.book.book.dto.BookTypeDto;
import com.pcloud.book.book.facade.BookTypeFacade;
......@@ -27,6 +11,16 @@ import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import com.pcloud.common.utils.cookie.Cookie;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @描述：
......@@ -36,8 +30,6 @@ import com.pcloud.common.utils.cookie.Cookie;
*/
@RequestMapping("/bookType")
@RestController("bookTypeFacade")
@Produces({ ContentType.APPLICATION_JSON_UTF_8 })
@Consumes({ MediaType.APPLICATION_JSON })
public class BookTypeFacadeImpl implements BookTypeFacade {
@Autowired
......
pcloud-service-book/src/main/java/com/pcloud/book/consumer/isbn/IsbnConsr.java
package com.pcloud.book.consumer.isbn;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import com.pcloud.book.book.entity.Book;
import com.pcloud.book.util.common.HttpUtils;
import com.pcloud.book.util.properties.BookProps;
import com.pcloud.common.entity.UploadResultInfo;
import com.pcloud.common.enums.ImageTypeEnum;
import com.pcloud.common.utils.FileUtils;
import com.pcloud.common.utils.UUIDUitl;
import com.pcloud.common.utils.aliyun.OssUtils;
import com.pcloud.common.utils.string.StringUtil;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.CloseableHttpResponse;
......@@ -21,18 +20,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
import com.pcloud.book.base.enums.BookTypeEnum;
import com.pcloud.book.book.entity.Book;
import com.pcloud.book.util.common.HttpUtils;
import com.pcloud.book.util.properties.BookProps;
import com.pcloud.common.entity.UploadResultInfo;
import com.pcloud.common.enums.ImageTypeEnum;
import com.pcloud.common.utils.DateUtils;
import com.pcloud.common.utils.FileUtils;
import com.pcloud.common.utils.UUIDUitl;
import com.pcloud.common.utils.aliyun.OssUtils;
import com.pcloud.common.utils.string.StringUtil;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
/**
* 通过isbn获取书籍信息
......@@ -84,30 +77,30 @@ public class IsbnConsr {
* @param isbn
* @return
*/
private Book setBook4Ali(String result, String isbn) {
Map<String, Object> temp = JSONObject.parseObject(result);
Book book = new Book();
if (null != temp) {
String errorCode = (String) temp.get("status");
// 如果返回成功
if ("0".equals(errorCode)) {
Map<String, String> bookInfo = (Map<String, String>) temp.get("result");
if (!(MapUtils.isEmpty(bookInfo) || StringUtil.isEmpty(bookInfo.get("title")))) {
book.setIsbn(isbn);
book.setAuthor(bookInfo.get("author"));
book.setPublishDate(DateChange(bookInfo.get("pubdate")));
book.setRemark(bookInfo.get("summary"));
book.setPublish(bookInfo.get("publisher"));
book.setBookPrice(bookInfo.get("price"));
book.setCoverImg(changePic(bookInfo.get("pic")));
book.setBookName(bookInfo.get("title"));
book.setDetail(bookInfo.get("summary"));
book.setTypeCode(BookTypeEnum.BOOK.value);
}
}
}
return book;
}
// private Book setBook4Ali(String result, String isbn) {
// Map<String, Object> temp = JSONObject.parseObject(result);
// Book book = new Book();
// if (null != temp) {
// String errorCode = (String) temp.get("status");
// // 如果返回成功
// if ("0".equals(errorCode)) {
// Map<String, String> bookInfo = (Map<String, String>) temp.get("result");
// if (!(MapUtils.isEmpty(bookInfo) || StringUtil.isEmpty(bookInfo.get("title")))) {
// book.setIsbn(isbn);
// book.setAuthor(bookInfo.get("author"));
// book.setPublishDate(DateChange(bookInfo.get("pubdate")));
// book.setRemark(bookInfo.get("summary"));
// book.setPublish(bookInfo.get("publisher"));
// book.setBookPrice(bookInfo.get("price"));
// book.setCoverImg(changePic(bookInfo.get("pic")));
// book.setBookName(bookInfo.get("title"));
// book.setDetail(bookInfo.get("summary"));
// book.setTypeCode(BookTypeEnum.BOOK.value);
// }
// }
// }
// return book;
// }
/**
* 设置书籍
......@@ -116,35 +109,35 @@ public class IsbnConsr {
* @param isbn
* @return
*/
@SuppressWarnings("unchecked")
private Book setBook4jisu(String result, String isbn) {
LOGGER.info("设置书籍result="+result+"isbn="+isbn);
if (StringUtil.isEmpty(result)) {
return null;
}
Map<String, Object> temp = JSONObject.parseObject(result);
Book book = new Book();
if (null != temp) {
String errorCode = (String) temp.get("status");
// 如果返回成功
if ("0".equals(errorCode)) {
Map<String, String> bookInfo = (Map<String, String>) temp.get("result");
if (!(MapUtils.isEmpty(bookInfo) || StringUtil.isEmpty(bookInfo.get("title")))) {
book.setIsbn(isbn);
book.setAuthor(bookInfo.get("author") == null ? null : bookInfo.get("author").toString());
book.setPublishDate(DateChange(bookInfo.get("pubdate")));
book.setRemark(bookInfo.get("summary"));
book.setPublish(bookInfo.get("publisher"));
book.setBookPrice(bookInfo.get("price"));
book.setCoverImg(changePic(bookInfo.get("pic")));
book.setBookName(bookInfo.get("title"));
book.setDetail(bookInfo.get("summary"));
book.setTypeCode(BookTypeEnum.BOOK.value);
}
}
}
return book;
}
// @SuppressWarnings("unchecked")
// private Book setBook4jisu(String result, String isbn) {
// LOGGER.info("设置书籍result="+result+"isbn="+isbn);
// if (StringUtil.isEmpty(result)) {
// return null;
// }
// Map<String, Object> temp = JSONObject.parseObject(result);
// Book book = new Book();
// if (null != temp) {
// String errorCode = (String) temp.get("status");
// // 如果返回成功
// if ("0".equals(errorCode)) {
// Map<String, String> bookInfo = (Map<String, String>) temp.get("result");
// if (!(MapUtils.isEmpty(bookInfo) || StringUtil.isEmpty(bookInfo.get("title")))) {
// book.setIsbn(isbn);
// book.setAuthor(bookInfo.get("author") == null ? null : bookInfo.get("author").toString());
// book.setPublishDate(DateChange(bookInfo.get("pubdate")));
// book.setRemark(bookInfo.get("summary"));
// book.setPublish(bookInfo.get("publisher"));
// book.setBookPrice(bookInfo.get("price"));
// book.setCoverImg(changePic(bookInfo.get("pic")));
// book.setBookName(bookInfo.get("title"));
// book.setDetail(bookInfo.get("summary"));
// book.setTypeCode(BookTypeEnum.BOOK.value);
// }
// }
// }
// return book;
// }
/**
* 修改图片地址
......@@ -185,32 +178,32 @@ public class IsbnConsr {
* @param isbn
* @return @
*/
@SuppressWarnings("unchecked")
private Book setBook(String result, String isbn) {
Book book = new Book();
Map<String, Object> temp = JSONObject.parseObject(result);
if (null != temp) {
Integer errorCode = (Integer) temp.get("error_code");
// 如果返回成功
if (errorCode == 0) {
Map<String, String> bookInfo = (Map<String, String>) temp.get("result");
if (!MapUtils.isEmpty(bookInfo)) {
book.setIsbn(isbn);
book.setAuthor(bookInfo.get("author"));
book.setPublishDate(DateChange(bookInfo.get("pubdate")));
book.setOriginName(bookInfo.get("origin_title"));
book.setRemark(bookInfo.get("summary"));
book.setPublish(bookInfo.get("publisher"));
book.setBookPrice(bookInfo.get("price"));
book.setCoverImg(changePic(bookInfo.get("images_medium")));
book.setBookName(bookInfo.get("title"));
book.setDetail(bookInfo.get("summary"));
book.setTypeCode(BookTypeEnum.BOOK.value);
}
}
}
return book;
}
// @SuppressWarnings("unchecked")
// private Book setBook(String result, String isbn) {
// Book book = new Book();
// Map<String, Object> temp = JSONObject.parseObject(result);
// if (null != temp) {
// Integer errorCode = (Integer) temp.get("error_code");
// // 如果返回成功
// if (errorCode == 0) {
// Map<String, String> bookInfo = (Map<String, String>) temp.get("result");
// if (!MapUtils.isEmpty(bookInfo)) {
// book.setIsbn(isbn);
// book.setAuthor(bookInfo.get("author"));
// book.setPublishDate(DateChange(bookInfo.get("pubdate")));
// book.setOriginName(bookInfo.get("origin_title"));
// book.setRemark(bookInfo.get("summary"));
// book.setPublish(bookInfo.get("publisher"));
// book.setBookPrice(bookInfo.get("price"));
// book.setCoverImg(changePic(bookInfo.get("images_medium")));
// book.setBookName(bookInfo.get("title"));
// book.setDetail(bookInfo.get("summary"));
// book.setTypeCode(BookTypeEnum.BOOK.value);
// }
// }
// }
// return book;
// }
/**
* 根据isbn 查询书籍信息返回json
......@@ -339,42 +332,42 @@ public class IsbnConsr {
return sb.toString();
}
/**
* 时间转换
*
* @param dateStr
* @return
*/
public static String DateChange(String dateStr) {
if (!(StringUtils.contains(dateStr, '年'))) {
if (dateStr != null) {
if (dateStr.length() == 6 || dateStr.length() == 7) {
return dateStr + "-1";
} else if (dateStr.length() == 4) {
return dateStr + "-1-1";
}
}
}
try {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月DD日");
SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy年");
if (dateStr.contains("年") && dateStr.contains("月") && dateStr.contains("日")) {
return DateUtils.formatDate(sdf2.parse(dateStr));
} else if (dateStr.contains("年") && dateStr.contains("月")) {
return DateUtils.formatDate(sdf1.parse(dateStr));
} else if (dateStr.contains("年")) {
return DateUtils.formatDate(sdf3.parse(dateStr));
} else {
dateStr = DateUtils.formatDate(DateUtils.getDateByStr(dateStr));
}
} catch (Exception e) {
dateStr = null;
}
if (StringUtil.isEmpty(dateStr)) {
dateStr = null;
}
return dateStr;
}
// /**
// * 时间转换
// *
// * @param dateStr
// * @return
// */
// public static String DateChange(String dateStr) {
// if (!(StringUtils.contains(dateStr, '年'))) {
// if (dateStr != null) {
// if (dateStr.length() == 6 || dateStr.length() == 7) {
// return dateStr + "-1";
// } else if (dateStr.length() == 4) {
// return dateStr + "-1-1";
// }
// }
// }
// try {
// SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月");
// SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月DD日");
// SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy年");
// if (dateStr.contains("年") && dateStr.contains("月") && dateStr.contains("日")) {
// return DateUtils.formatDate(sdf2.parse(dateStr));
// } else if (dateStr.contains("年") && dateStr.contains("月")) {
// return DateUtils.formatDate(sdf1.parse(dateStr));
// } else if (dateStr.contains("年")) {
// return DateUtils.formatDate(sdf3.parse(dateStr));
// } else {
// dateStr = DateUtils.formatDate(DateUtils.getDateByStr(dateStr));
// }
// } catch (Exception e) {
// dateStr = null;
// }
// if (StringUtil.isEmpty(dateStr)) {
// dateStr = null;
// }
// return dateStr;
// }
}
pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/PartyConsr.java
......@@ -7,10 +7,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.dto.ResponseDto;
import com.pcloud.usercenter.party.common.dto.PartyListDto;
import com.pcloud.usercenter.party.common.vo.PartyIdListVO;
import com.pcloud.usercenter.user.service.UserLoginService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import com.pcloud.common.exceptions.BizException;
......@@ -65,4 +70,10 @@ public class PartyConsr {
return resultMap;
}
@ParamLog(value = "获取测试账号", isAfterReturn = false)
public PartyIdListVO getPartyIdList4Test() {
ResponseEntity<ResponseDto<PartyIdListVO>> partyIdList = partyService.getPartyIdList4Test();
PartyIdListVO partyIdListVO = ResponseHandleUtil.parseResponse(partyIdList, PartyIdListVO.class);
return partyIdListVO;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/BookAuthUserBiz.java
......@@ -47,7 +47,7 @@ public interface BookAuthUserBiz {
/**
* 获取授权信息总的统计数据
*/
BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds);
BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds, List<Long> removeAdviserIds);
/**
* 新增点击购买记录
......
pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/impl/BookAuthInfoBizImpl.java
......@@ -8,6 +8,7 @@ import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.consumer.app.AssistTempletConsr;
import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
import com.pcloud.book.consumer.common.ExportConsr;
import com.pcloud.book.consumer.user.PartyConsr;
import com.pcloud.book.copyright.biz.BookAuthCodeBiz;
import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
import com.pcloud.book.copyright.biz.BookAuthServeBiz;
......@@ -43,6 +44,7 @@ import com.pcloud.common.utils.DateUtils;
import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
import com.pcloud.common.utils.string.StringUtil;
import com.pcloud.usercenter.party.common.vo.PartyIdListVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
......@@ -103,6 +105,9 @@ public class BookAuthInfoBizImpl implements BookAuthInfoBiz {
@Autowired
private BookClickBuyRecordDao bookClickBuyRecordDao;
@Autowired
private PartyConsr partyConsr;
private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(2);
@Override
@Transactional(rollbackFor = Exception.class)
......@@ -504,21 +509,24 @@ public class BookAuthInfoBizImpl implements BookAuthInfoBiz {
@Override
public BookAuthTotalCountDTO getBookAuthTotalCount(List<Long> adviserIds) {
//获取出版社下的编辑
PartyIdListVO partyIdList4Test = partyConsr.getPartyIdList4Test();
List<Long> removeAdviserIds = partyIdList4Test == null ? null : partyIdList4Test.getAdviserIds();
BookAuthTotalCountDTO bookAuthTotalCountDTO = new BookAuthTotalCountDTO();
//获取开启正版授权图书的总数
Integer openCount = bookAuthInfoDao.getTotalNum(adviserIds);
Integer openCount = bookAuthInfoDao.getTotalNum(adviserIds, removeAdviserIds);
if(openCount == null || openCount == 0){
setZeroData(bookAuthTotalCountDTO);
return bookAuthTotalCountDTO;
}else {
bookAuthTotalCountDTO.setOpenCount(openCount);
}
BookAuthCodeUserVO authUserTotalCount = bookAuthUserBiz.getAuthUserTotalCount(adviserIds);
BookAuthCodeUserVO authUserTotalCount = bookAuthUserBiz.getAuthUserTotalCount(adviserIds, removeAdviserIds);
if(authUserTotalCount!=null){
BeanUtils.copyProperties(authUserTotalCount, bookAuthTotalCountDTO);
}
//获取点击链接总数
Integer count = bookClickBuyRecordDao.getClickBuyRecordCount(adviserIds);
Integer count = bookClickBuyRecordDao.getClickBuyRecordCount(adviserIds, removeAdviserIds);
bookAuthTotalCountDTO.setClickBuyCount(count);
return bookAuthTotalCountDTO;
}
......
pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/impl/BookAuthUserBizImpl.java
......@@ -144,8 +144,8 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
}
@Override
public BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds) {
BookAuthCodeUserVO bookAuthCodeUserVO = bookAuthUserDao.getAuthUserTotalCount(adviserIds);
public BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds, List<Long> removeAdviserIds) {
BookAuthCodeUserVO bookAuthCodeUserVO = bookAuthUserDao.getAuthUserTotalCount(adviserIds, removeAdviserIds);
if(bookAuthCodeUserVO != null){
bookAuthCodeUserVO.setCodeUserCount(bookAuthCodeUserVO.getTotalCount() - bookAuthCodeUserVO.getPayUserCount());
}
......
pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookAuthInfoDao.java
......@@ -47,5 +47,5 @@ public interface BookAuthInfoDao extends BaseDao<BookAuthInfo> {
/**
* 获取总的数量
*/
Integer getTotalNum(List<Long> adviserIds);
Integer getTotalNum(List<Long> adviserIds, List<Long> removeAdviserIds);
}
pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookAuthUserDao.java
......@@ -44,7 +44,7 @@ public interface BookAuthUserDao extends BaseDao<BookAuthUser> {
/**
* 获取总的授权用户数据
*/
BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds);
BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds, List<Long> removeAdviserIds);
/**
* 获取top10的图书
......
pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookClickBuyRecordDao.java
......@@ -10,5 +10,5 @@ import java.util.List;
* @date 2018/12/20 15:41
*/
public interface BookClickBuyRecordDao extends BaseDao<BookClickBuyRecord> {
Integer getClickBuyRecordCount(List<Long> adviserIds);
Integer getClickBuyRecordCount(List<Long> adviserIds, List<Long> removeAdviserIds);
}
pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/impl/BookAuthInfoDaoImpl.java
......@@ -68,7 +68,10 @@ public class BookAuthInfoDaoImpl extends BaseDaoImpl<BookAuthInfo> implements Bo
}
@Override
public Integer getTotalNum(List<Long> adviserIds) {
return this.getSqlSession().selectOne(this.getStatement("getTotalNum"), adviserIds);
public Integer getTotalNum(List<Long> adviserIds, List<Long> removeAdviserIds) {
Map<String , Object> paramMap = new HashMap<>();
paramMap.put("adviserIds",adviserIds);
paramMap.put("removeAdviserIds",removeAdviserIds);
return this.getSqlSession().selectOne(this.getStatement("getTotalNum"), paramMap);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/impl/BookAuthUserDaoImpl.java
......@@ -66,8 +66,11 @@ public class BookAuthUserDaoImpl extends BaseDaoImpl<BookAuthUser> implements Bo
}
@Override
public BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds) {
return this.getSqlSession().selectOne(this.getStatement("getAuthUserTotalCount"), adviserIds);
public BookAuthCodeUserVO getAuthUserTotalCount(List<Long> adviserIds, List<Long> removeAdviserIds) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("adviserIds", adviserIds);
paramMap.put("removeAdviserIds", removeAdviserIds);
return this.getSqlSession().selectOne(this.getStatement("getAuthUserTotalCount"), paramMap);
}
@Override
......
pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/impl/BookClickBuyRecordDaoImpl.java
......@@ -5,7 +5,9 @@ import com.pcloud.book.copyright.entity.BookClickBuyRecord;
import com.pcloud.common.core.dao.BaseDaoImpl;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author lily
......@@ -14,7 +16,10 @@ import java.util.List;
@Component("bookClickBuyRecordDao")
public class BookClickBuyRecordDaoImpl extends BaseDaoImpl<BookClickBuyRecord> implements BookClickBuyRecordDao {
@Override
public Integer getClickBuyRecordCount(List<Long> adviserIds) {
return this.getSqlSession().selectOne(this.getStatement("getClickBuyRecordCount"), adviserIds);
public Integer getClickBuyRecordCount(List<Long> adviserIds, List<Long> removeAdviserIds) {
Map<String , Object> paramMap = new HashMap<>();
paramMap.put("adviserIds",adviserIds);
paramMap.put("removeAdviserIds",removeAdviserIds);
return this.getSqlSession().selectOne(this.getStatement("getClickBuyRecordCount"), paramMap);
}
}
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
......@@ -838,7 +838,7 @@
bt.TYPE_NAME
FROM
BOOK_ADVISER ba
LEFT JOIN
JOIN
BOOK b
ON
b.BOOK_ID = ba.BOOK_ID
......@@ -868,6 +868,42 @@
</if>
</select>
<select id="listBookClassifyCount" resultType="Long" parameterType="map">
SELECT
count(1)
FROM
BOOK_ADVISER ba
<if test="typeCode!=null or bookName!=null">
JOIN
BOOK b
ON
b.BOOK_ID = ba.BOOK_ID
LEFT JOIN
BOOK_TYPE bt
ON
b.TYPE_CODE = bt.TYPE_CODE
</if>
WHERE
ba.IS_DELETE = 0
<if test="typeCode!=null">
AND b.TYPE_CODE = #{typeCode, jdbcType=VARCHAR}
</if>
<if test="templeIds!=null">
AND
ba.TEMPLET_ID in
<foreach collection="templeIds" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
<if test="startDate!=null">
AND ba.CREATED_DATE <![CDATA[ > ]]> #{startDate} AND ba.CREATED_DATE <![CDATA[ < ]]> #{endDate}
</if>
<if test="bookName!=null">
AND b.BOOK_NAME LIKE CONCAT('%', #{bookName},'%')
</if>
</select>
<!-- 获取平台下除默认生成图书的所有图书 -->
<select id="getAllBook4Platform" resultMap="bookMap" parameterType="map">
SELECT
......
pcloud-service-book/src/main/resources/mapper/copyright/BookAuthInfo.Mapper.xml
......@@ -166,16 +166,22 @@
ADVISER_ID = #{adviserId, jdbcType=BIGINT}
</select>
<select id="getTotalNum" resultType="Integer">
<select id="getTotalNum" resultType="Integer" parameterType="map">
SELECT
COUNT(1)
FROM
BOOK_AUTH_INFO
WHERE
BOOK_STATUS = 1
<if test="list!=null">
<if test="adviserIds!=null">
AND ADVISER_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
<foreach collection="adviserIds" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
<if test="removeAdviserIds!=null">
AND ADVISER_ID not in
<foreach collection="removeAdviserIds" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
......
pcloud-service-book/src/main/resources/mapper/copyright/BookAuthUser.Mapper.xml
......@@ -105,18 +105,24 @@
GROUP BY province order by totalCount desc limit 10
</select>
<select id="getAuthUserTotalCount" resultType="bookAuthCodeUserVO" parameterType="list" >
<select id="getAuthUserTotalCount" resultType="bookAuthCodeUserVO" parameterType="map" >
SELECT
COUNT(1) totalCount,
IFNULL(SUM(is_auth_code),0) payUserCount
FROM
BOOK_AUTH_USER
<if test="list != null">
WHERE ADVISER_ID in
BOOK_AUTH_USER WHERE 1 = 1
<if test="adviserIds != null">
AND ADVISER_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
<if test="removeAdviserIds != null">
AND ADVISER_ID not in
<foreach collection="removeAdviserIds" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
</select>
......
pcloud-service-book/src/main/resources/mapper/copyright/BookClickBuyRecord.Mapper.xml
......@@ -10,16 +10,22 @@
#{wechatUserId}, NOW())
</insert>
<select id="getClickBuyRecordCount" resultType="Integer" parameterType="list">
<select id="getClickBuyRecordCount" resultType="Integer" parameterType="map">
SELECT
COUNT(distinct WECHAT_USER_ID)
FROM
BOOK_CLICK_BUY_RECORD
WHERE
1=1
<if test="list!=null">
<if test="adviserIds!=null">
AND ADVISER_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
<foreach collection="adviserIds" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
<if test="removeAdviserIds!=null">
AND ADVISER_ID not in
<foreach collection="removeAdviserIds" item="item" open="(" separator="," close=")">
${item}
</foreach>
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment