Merge branch 'feature/1002988' into 'master'

feat: [1002988] 书刊数据地图

See merge request rays/pcloud-book!772

pcloud-facade-book/src/main/java/com/pcloud/book/book/constant/BookConstant.java

@@ -349,4 +349,8 @@ public class BookConstant {
     public static final Long[] TEST_ADVISERS = new Long[]{1404L,1001195L};
 
     public static final String HANZI = "哈或";
+
+    public static final String countryRegionCode = "100000";
+
+    public static final Integer countryAreaCode = 0;
 }

pcloud-facade-book/src/main/java/com/pcloud/book/record/entity/BookBrowseRecord.java

+package com.pcloud.book.record.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class BookBrowseRecord extends BaseEntity {
+
+    private Long sceneId;
+
+    private Long bookId;
+
+    private Long bookAdviserId;
+
+    private String bookName;
+
+    private Long adviserId;
+
+    private Long agentId;
+
+    private String isbn;
+
+    private Long userId;
+
+    private String province;
+
+    private String provinceCode;
+
+    private String city;
+
+    private String cityCode;
+
+    private String district;
+
+    private String districtCode;
+
+    private Long graLabelId;
+
+    private Long subLabelId;
+
+    private Long firstClassifyId;
+
+    private Long secondClassifyId;
+
+    private Long bookClassifyId;
+
+    private String ip;
+
+}
\ No newline at end of file

pcloud-facade-book/src/main/java/com/pcloud/book/record/service/impl/BookBrowseRecordService.java

+package com.pcloud.book.record.service.impl;
+
+import com.aliyun.oss.HttpMethod;
+import com.pcloud.book.record.entity.BookBrowseRecord;
+import com.pcloud.common.dto.ResponseDto;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@FeignClient(value = "pcloud-service-book", qualifier = "bookBrowseRecordPcloud", path = "book/v1.0/bookBrowseRecordService")
+public interface BookBrowseRecordService {
+
+    @RequestMapping(value = "addBookRecord", method = RequestMethod.POST)
+    public void addBookRecord(@RequestBody BookBrowseRecord bookBrowseRecord);
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/AppletBookClassifyBiz.java

@@ -8,6 +8,7 @@ import com.pcloud.book.applet.entity.AppletBookClassify;
 import com.pcloud.book.applet.entity.AppletUserLabelRelation;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 小程序书刊分类
@@ -110,4 +111,14 @@ public interface AppletBookClassifyBiz {
      *  * @param null
      */
     List<AssistTempletDTO> getChildTempletList(Long appletBookClassifyId);
+
+
+    /**
+     * 根据一级分类id获取书籍分类id
+     * @param firstClassifyId
+     * @return
+     */
+    Long getAppletBookClassifyId(Long firstClassifyId);
+
+    Map<Long, AppletBookClassifyDTO> getBookClassifyByIds(List<Long> bookAdviserIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletBookClassifyBizImpl.java

@@ -273,4 +273,14 @@ public class AppletBookClassifyBizImpl implements AppletBookClassifyBiz {
         return assistTempletConsr.getChildTempletList(templetIds);
     }
 
+    @Override
+    public Long getAppletBookClassifyId(Long firstClassifyId) {
+        return appletBookClassifyDao.getAppletBookClassifyId(firstClassifyId);
+    }
+
+    @Override
+    public Map<Long, AppletBookClassifyDTO> getBookClassifyByIds(List<Long> bookAdviserIds) {
+        return appletBookClassifyDao.getBookClassifyByIds(bookAdviserIds);
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/AppletBookClassifyDao.java

@@ -6,6 +6,7 @@ import com.pcloud.book.applet.entity.AppletBookClassify;
 import com.pcloud.common.core.dao.BaseDao;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 小程序客户端书刊分类(AppletBookClassify)表数据库访问层
@@ -46,4 +47,13 @@ public interface AppletBookClassifyDao extends BaseDao<AppletBookClassify>{
      *  * @param null
      */
     List<Long> getRelationBookTempletByBookClassify(Long bookClassifyId);
+
+    /**
+     * 根据一级分类id获取书籍分类id
+     * @param firstClassifyId
+     * @return
+     */
+    Long getAppletBookClassifyId(Long firstClassifyId);
+
+    Map<Long, AppletBookClassifyDTO> getBookClassifyByIds(List<Long> bookAdviserIds);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/AppletBookClassifyDaoImpl.java

@@ -43,4 +43,13 @@ public class AppletBookClassifyDaoImpl extends BaseDaoImpl<AppletBookClassify> i
     public List<Long> getRelationBookTempletByBookClassify(Long bookClassifyId) {
         return getSessionTemplate().selectList(getStatement("getRelationBookTempletByBookClassify"), bookClassifyId);
     }
+
+    @Override
+    public Long getAppletBookClassifyId(Long firstClassifyId) {
+        return getSessionTemplate().selectOne(getStatement("getAppletBookClassifyId"), firstClassifyId);
+    }
+
+    @Override
+    public Map<Long, AppletBookClassifyDTO> getBookClassifyByIds(List<Long> bookAdviserIds) {
+        return getSessionTemplate().selectMap(getStatement("getBookClassifyByIds"),bookAdviserIds,"id");    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookAdviserDao.java

@@ -261,4 +261,6 @@ public interface BookAdviserDao extends BaseDao<BookAdviser> {
 	 * @return
 	 */
 	BookAdviserDto getOneMainBook(Long bookId);
+
+	Map<Long, BookAdviserDto> getByBookAdviserIds(List<Long> bookAdviserIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookAdviserDaoImpl.java

@@ -263,4 +263,10 @@ public class BookAdviserDaoImpl extends BaseDaoImpl<BookAdviser> implements Book
 	public BookAdviserDto getOneMainBook(Long bookId) {
 		return getSessionTemplate().selectOne(getStatement("getOneMainBook"),bookId);
 	}
+
+	@Override
+	public Map<Long, BookAdviserDto> getByBookAdviserIds(List<Long> bookAdviserIds) {
+		return super.getSqlSession().selectMap(this.getStatement("getByBookAdviserIds"), bookAdviserIds, "bookAdviserId");
+
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/ChannelConsr.java

@@ -4,6 +4,7 @@
 package com.pcloud.book.consumer.user;
 
 import com.pcloud.channelcenter.base.exceptions.ChannelBizException;
+import com.pcloud.channelcenter.qrcode.service.QrcodeSceneService;
 import com.pcloud.channelcenter.wechat.service.MessageService;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ListUtils;
@@ -34,6 +35,8 @@ public class ChannelConsr {
 	private ChannelService channelService;
 	@Autowired
 	private MessageService messageService;
+	@Autowired
+	private QrcodeSceneService qrcodeSceneService;
 
 	/**
 	 * 获取渠道名称
@@ -141,4 +144,19 @@ public class ChannelConsr {
 			throw new ChannelBizException(ChannelBizException.PARAM_IS_NULL, "运营不存在");
 		}
 	}
+
+	public Long getBookId4SceneId(Long sceneId) {
+		Long bookId = null;
+		LOGGER.info("根据sceneId获取bookId,<START>.[sceneId]=" + sceneId);
+		try {
+			bookId = ResponseHandleUtil.parseResponse(qrcodeSceneService.getBookId4SceneId(sceneId), Long.class);
+			if (null == bookId) {
+				throw new ChannelBizException(ChannelBizException.PARAM_IS_NULL, "bookId为空");
+			}
+			return bookId;
+		} catch (Exception e) {
+			LOGGER.error("根据sceneId获取bookId" + e.getMessage(), e);
+			throw new ChannelBizException(ChannelBizException.PARAM_IS_NULL, "bookId为空");
+		}
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupBiz.java

@@ -60,7 +60,6 @@ import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -794,9 +793,10 @@ public interface BookGroupBiz {
     /**
      * 获取小程序码
      * @param bookGroupId
+     * @param requestIp
      * @return
      */
-    public BookAppletSceneDTO getBookGroupAppletByBookGroupId(Long bookGroupId);
+    public BookAppletSceneDTO getBookGroupAppletByBookGroupId(Long bookGroupId, String requestIp);
 
     /**
      * 更新小睿分类

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

@@ -159,6 +159,8 @@ import com.pcloud.book.pcloudkeyword.biz.PcloudRobotBiz;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobot;
 import com.pcloud.book.push.enums.AltTypeEnum;
 import com.pcloud.book.reading.dao.ReadingUserDao;
+import com.pcloud.book.record.biz.BookBrowseRecordBiz;
+import com.pcloud.book.record.entity.BookBrowseRecord;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.dto.RightsSettingDto;
@@ -403,6 +405,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
     private AppletUserBookcaseBiz appletUserBookcaseBiz;
     @Autowired
     private AppletGroupSearchRecordBiz appletGroupSearchRecordBiz;
+    @Autowired
+    private BookBrowseRecordBiz bookBrowseRecordBiz;
 
     private static final ThreadPoolExecutor PLATFORM_STATISTICS_EXPORT_THREAD = new ThreadPoolExecutor(2, 2,
             0, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
@@ -4782,13 +4786,18 @@ public class BookGroupBizImpl implements BookGroupBiz {
     }
 
     @Override
-    public BookAppletSceneDTO getBookGroupAppletByBookGroupId( Long bookGroupId ) {
+    public BookAppletSceneDTO getBookGroupAppletByBookGroupId(Long bookGroupId, String requestIp) {
         BookAppletScene bookAppletScene = bookAppletSceneDao.getByBookGroupId(bookGroupId);
         BookAppletSceneDTO dto = new BookAppletSceneDTO();
         if (null != bookAppletScene) {
             BeanUtils.copyProperties(bookAppletScene, dto);
         }
         BookGroupDTO bookGroupDTO = bookGroupDao.getBookBaseInfoById(bookGroupId);
+        // 新增埋点
+        BookBrowseRecord bookBrowseRecord = new BookBrowseRecord();
+        bookBrowseRecord.setBookId(bookGroupDTO.getBookId());
+        bookBrowseRecord.setIp(requestIp);
+        bookBrowseRecordBiz.addBookRecord4BookId(bookBrowseRecord);
         if (bookGroupDTO.getOpenWeapp()) {//1v1走小睿流程
             return dto;
         } else {

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupDao.java

@@ -337,4 +337,5 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
      */
     Map<Long,BookGroupDTO> mapDTOByIds(List<Long> ids);
 
+    Map<Long, BookGroupDTO> getBookBaseInfoByAdviserBookIds(List<Long> bookAdviserId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookGroupDaoImpl.java

@@ -411,4 +411,9 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
         map.put("list",ids);
         return getSessionTemplate().selectMap(getStatement("mapDTOByIds"),map,"id");
     }
+
+    @Override
+    public Map<Long, BookGroupDTO> getBookBaseInfoByAdviserBookIds(List<Long> bookAdviserIds) {
+        return getSessionTemplate().selectMap(getStatement("getBookBaseInfoByAdviserBookIds"),bookAdviserIds,"bookAdviserId");
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java

@@ -315,6 +315,16 @@ public class BookGroupDTO extends BaseDto {
 
     private Long adviserId;
 
+    private Long bookAdviserId;
+
+    public Long getBookAdviserId() {
+        return bookAdviserId;
+    }
+
+    public void setBookAdviserId(Long bookAdviserId) {
+        this.bookAdviserId = bookAdviserId;
+    }
+
     public Long getAdviserId() {
         return adviserId;
     }

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java

@@ -22,6 +22,7 @@ import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
 
+import javax.servlet.http.HttpServletRequest;
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.CookieValue;
@@ -74,7 +75,7 @@ public interface BookGroupFacade {
             @ApiImplicitParam(name = "bookGroupId", value = "群二维码ID", dataType = "long", paramType = "query")
     })
     @RequestMapping(value = "getBookGroupInfo4Wechat", method = RequestMethod.GET)
-    ResponseDto<?> getBookGroupInfo4Wechat(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId)
+    ResponseDto<?> getBookGroupInfo4Wechat(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId, HttpServletRequest request)
             throws BizException, PermissionException, JsonParseException;
 
     @ApiOperation(value = "获取社群书群二维码信息", httpMethod = "GET")
@@ -700,7 +701,8 @@ public interface BookGroupFacade {
     @ApiOperation("根据获取社群书小程序信息")
     @ApiImplicitParam(name = "bookGroupId", value = "bookGroupId", required = true, dataType = "long", paramType = "query")
     @GetMapping("getBookGroupAppletByBookGroupId")
-    ResponseDto<BookAppletSceneDTO> getBookGroupAppletByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId);
+    ResponseDto<BookAppletSceneDTO> getBookGroupAppletByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId,
+                                                                    HttpServletRequest request);
 
     @ApiOperation("根据临时书刊id获取社群书id")
     @ApiImplicitParam(name = "raysBookId", value = "临时书刊id", required = true, dataType = "long", paramType = "query")

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupFacadeImpl.java

@@ -3,6 +3,7 @@ package com.pcloud.book.group.facade.impl;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
+import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dto.BookAppletSceneDTO;
 import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
@@ -29,6 +30,8 @@ import com.pcloud.book.group.vo.UpdateRankTypeVO;
 import com.pcloud.book.group.vo.UserBookInfoVO;
 import com.pcloud.book.group.vo.WxGroupStatisticVO;
 import com.pcloud.book.keywords.vo.ListKeywordVO;
+import com.pcloud.book.record.biz.BookBrowseRecordBiz;
+import com.pcloud.book.record.entity.BookBrowseRecord;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -38,10 +41,12 @@ import com.pcloud.common.page.PageParam;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.common.utils.cookie.Cookie;
+import com.pcloud.common.utils.nginx.NginxUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.wechatgroup.base.exception.WechatGroupBizException;
 import com.pcloud.wechatgroup.message.enums.IsSystem;
 
+import javax.servlet.http.HttpServletRequest;
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -78,6 +83,10 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
     private BookGroupBiz bookGroupBiz;
     @Autowired
     private BookGroupClassifyBiz bookGroupClassifyBiz;
+    @Autowired
+    private BookGroupDao bookGroupDao;
+    @Autowired
+    private BookBrowseRecordBiz bookBrowseRecordBiz;
 
     @SneakyThrows
     @PostMapping("updateNoISBNBookGeneratorQrcode")
@@ -118,11 +127,18 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
      */
     @Override
     @RequestMapping(value = "getBookGroupInfo4Wechat", method = RequestMethod.GET)
-    public ResponseDto<?> getBookGroupInfo4Wechat( @RequestParam(value = "bookGroupId", required = false) Long bookGroupId )
+    public ResponseDto<?> getBookGroupInfo4Wechat( @RequestParam(value = "bookGroupId", required = false) Long bookGroupId, HttpServletRequest request)
             throws BizException, PermissionException, JsonParseException {
         if (null == bookGroupId) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "参数有误！");
         }
+        String requestIp = NginxUtils.getClientIp(request);
+        // 新增埋点
+        BookBrowseRecord bookBrowseRecord = new BookBrowseRecord();
+        BookGroupDTO bookGroupDTO = bookGroupDao.getBookBaseInfoById(bookGroupId);
+        bookBrowseRecord.setBookId(bookGroupDTO.getBookId());
+        bookBrowseRecord.setIp(requestIp);
+        bookBrowseRecordBiz.addBookRecord4BookId(bookBrowseRecord);
         return new ResponseDto<>(bookGroupBiz.getBookGroupInfo4Wechat(bookGroupId));
     }
 
@@ -1131,11 +1147,12 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
 
     @Override
     @GetMapping("getBookGroupAppletByBookGroupId")
-    public ResponseDto<BookAppletSceneDTO> getBookGroupAppletByBookGroupId( @RequestParam("bookGroupId") Long bookGroupId ) {
+    public ResponseDto<BookAppletSceneDTO> getBookGroupAppletByBookGroupId( @RequestParam("bookGroupId") Long bookGroupId, HttpServletRequest request) {
         if (null == bookGroupId) {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "bookGroupId不能为空！");
         }
-        return new ResponseDto<>(bookGroupBiz.getBookGroupAppletByBookGroupId(bookGroupId));
+        String requestIp = NginxUtils.getClientIp(request);
+        return new ResponseDto<>(bookGroupBiz.getBookGroupAppletByBookGroupId(bookGroupId, requestIp));
     }
 
     @Override

pcloud-service-book/src/main/java/com/pcloud/book/record/biz/BookBrowseRecordBiz.java

+package com.pcloud.book.record.biz;
+
+import com.pcloud.book.record.entity.AreaStatistics;
+import com.pcloud.book.record.entity.BookBrowseRecord;
+import com.pcloud.book.record.entity.BookDetail;
+import com.pcloud.book.record.entity.BookDetailDTO;
+import com.pcloud.book.record.entity.BookMapStatistics;
+import com.pcloud.book.record.entity.MapData;
+import com.pcloud.book.record.entity.RegionMap;
+import com.pcloud.common.page.PageBeanNew;
+import com.pcloud.common.page.PageParam;
+import java.util.List;
+import java.util.Map;
+
+public interface BookBrowseRecordBiz {
+
+    void addBookRecord(BookBrowseRecord bookBrowseRecord);
+
+    void addBookRecord4BookId(BookBrowseRecord bookBrowseRecord);
+
+    List<BookMapStatistics> getBookCount4Country(String regionCode);
+
+    AreaStatistics getAreaStatistics(String regionCode, Integer areaCode);
+
+    PageBeanNew<BookDetail> getBookDetail(String regionCode, Integer areaCode, PageParam pageParam,
+            String bookName, Long agentId, Long bookClassifyId);
+
+    void addJsonData();
+
+    PageBeanNew<MapData> getJsonData(String regionCode, Integer currentPage, Integer numPerPage);
+
+    Map<String, List<RegionMap>> getCitysByPY(String keyword);
+
+    void handleOldData();
+}

pcloud-service-book/src/main/java/com/pcloud/book/record/dao/BookBrowseRecordDAO.java

+package com.pcloud.book.record.dao;
+
+import com.pcloud.book.record.entity.AreaStatistics;
+import com.pcloud.book.record.entity.BookBrowseRecord;
+import com.pcloud.book.record.entity.BookMapStatistics;
+import com.pcloud.book.record.entity.ClassifyStatistics;
+import com.pcloud.common.core.dao.BaseDao;
+import java.util.List;
+import java.util.Map;
+import org.springframework.stereotype.Repository;
+
+
+public interface BookBrowseRecordDAO extends BaseDao<BookBrowseRecord> {
+    int deleteByPrimaryKey(Long id);
+
+    int insertSelective(BookBrowseRecord record);
+
+    BookBrowseRecord selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(BookBrowseRecord record);
+
+    int updateByPrimaryKey(BookBrowseRecord record);
+
+    List<BookMapStatistics> getBookCount4Country(String regionCode);
+
+    AreaStatistics getAreaStatistics(String regionCode, Integer areaCode);
+
+    List<ClassifyStatistics> getClassifyStatistics(String regionCode, Integer areaCode);
+
+    void getBookDetail(Map<String, Object> paramMap);
+}

pcloud-service-book/src/main/java/com/pcloud/book/record/dao/MapDataDAO.java

+package com.pcloud.book.record.dao;
+
+import com.pcloud.book.record.entity.MapData;
+import com.pcloud.common.core.dao.BaseDao;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+
+public interface MapDataDAO extends BaseDao<MapData> {
+
+    MapData selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MapData record);
+
+    int updateByPrimaryKeyWithBLOBs(MapData record);
+
+    int updateByPrimaryKey(MapData record);
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/dao/impl/BookBrowseRecordDAOImpl.java

+package com.pcloud.book.record.dao.impl;
+
+import com.pcloud.book.record.dao.BookBrowseRecordDAO;
+import com.pcloud.book.record.entity.AreaStatistics;
+import com.pcloud.book.record.entity.BookBrowseRecord;
+import com.pcloud.book.record.entity.BookMapStatistics;
+import com.pcloud.book.record.entity.ClassifyStatistics;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @ClassName com.pcloud.book.record.dao.impl.BookBrowseRecordDAOImpl
+ * @Author 吴博
+ * @Description 书刊浏览记录DAO
+ * @Date 2020/6/16 10:49
+ * @Version 1.0
+ **/
+@Repository("bookBrowseRecord")
+public class BookBrowseRecordDAOImpl extends BaseDaoImpl<BookBrowseRecord> implements BookBrowseRecordDAO {
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return getSessionTemplate().delete(getStatement("deleteByPrimaryKey"), id);
+    }
+
+    @Override
+    public int insertSelective(BookBrowseRecord record) {
+        return getSessionTemplate().insert(getStatement("insertSelective"), record);
+    }
+
+    @Override
+    public BookBrowseRecord selectByPrimaryKey(Long id) {
+        return getSessionTemplate().selectOne(getStatement("selectByPrimaryKey"),id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(BookBrowseRecord record) {
+        return getSessionTemplate().update(getStatement("updateByPrimaryKeySelective"), record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BookBrowseRecord record) {
+        return getSessionTemplate().update(getStatement("updateByPrimaryKey"), record);
+
+    }
+
+    @Override
+    public List<BookMapStatistics> getBookCount4Country(String regionCode) {
+        return getSessionTemplate().selectList(getStatement("getBookCount4Country"), regionCode);
+    }
+
+    @Override
+    public AreaStatistics getAreaStatistics(String regionCode, Integer areaCode) {
+        Map<String,Object> paramMap = new HashMap<>();
+        paramMap.put("regionCode", regionCode);
+        paramMap.put("areaCode", areaCode);
+        return getSessionTemplate().selectOne(getStatement("getAreaStatistics"), paramMap);
+    }
+
+    @Override
+    public List<ClassifyStatistics> getClassifyStatistics(String regionCode, Integer areaCode) {
+        Map<String,Object> paramMap = new HashMap<>();
+        paramMap.put("regionCode", regionCode);
+        paramMap.put("areaCode", areaCode);
+        return getSessionTemplate().selectList(getStatement("getClassifyStatistics"), paramMap);
+    }
+
+    @Override
+    public void getBookDetail(Map<String, Object> paramMap) {
+        getSessionTemplate().selectList(getStatement("getBookDetail"), paramMap);
+    }
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/dao/impl/MapDataDAOImpl.java

+package com.pcloud.book.record.dao.impl;
+
+import com.pcloud.book.record.dao.MapDataDAO;
+import com.pcloud.book.record.entity.MapData;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import java.util.List;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @ClassName com.pcloud.book.record.dao.impl.MapDataDAOImpl
+ * @Author 吴博
+ * @Description 地图渲染数据
+ * @Date 2020/6/16 16:22
+ * @Version 1.0
+ **/
+
+@Repository("mapDataDAO")
+public class MapDataDAOImpl extends BaseDaoImpl<MapData> implements MapDataDAO {
+
+    @Override
+    public MapData selectByPrimaryKey(Long id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(MapData record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByPrimaryKeyWithBLOBs(MapData record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByPrimaryKey(MapData record) {
+        return 0;
+    }
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/AreaStatistics.java

+package com.pcloud.book.record.entity;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.ClassifyStatistics
+ * @Author 吴博
+ * @Description 书刊分类统计
+ * @Date 2020/6/15 18:07
+ * @Version 1.0
+ **/
+@Data
+public class AreaStatistics {
+
+    //当前统筹区code string类型
+    private String regionCode;
+
+    private String regionName;
+
+    private Integer bookCount;
+
+    private List<ClassifyStatistics> classifyStatisticsList;
+}

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/BookDetail.java

+package com.pcloud.book.record.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.BookDetail
+ * @Author 吴博
+ * @Description 书刊详情
+ * @Date 2020/6/16 9:42
+ * @Version 1.0
+ **/
+@Data
+public class BookDetail {
+
+    private Long bookId;
+    private Long bookAdviserId;
+    private String bookName;
+    private String isbn;
+    private Long adviserId;
+    private String adviserName;
+    private Long agentId;
+    private String agentName;
+    private Long bookClassifyId;
+    private String bookClassifyName;
+    private String bookGroupName;
+    private String bookGroupUrl;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/BookDetailDTO.java

+package com.pcloud.book.record.entity;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.BookDetailDTO
+ * @Author 吴博
+ * @Description 书刊详情DTO
+ * @Date 2020/6/16 10:33
+ * @Version 1.0
+ **/
+@Data
+public class BookDetailDTO {
+    private Long regionId;
+    private String regionName;
+    private List<BookDetail> bookDetailList;
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/BookMapStatistics.java

+package com.pcloud.book.record.entity;
+
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.BookStatistics
+ * @Author 吴博
+ * @Description 书刊统计
+ * @Date 2020/6/15 17:24
+ * @Version 1.0
+ **/
+@Data
+public class BookMapStatistics {
+
+    private String province;
+
+    private String provinceCode;
+
+    private String city;
+
+    private String cityCode;
+
+    private Integer bookCount;
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/ClassifyStatistics.java

+package com.pcloud.book.record.entity;
+
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.ClassifyStatistics
+ * @Author 吴博
+ * @Description 书刊分类统计
+ * @Date 2020/6/15 18:07
+ * @Version 1.0
+ **/
+@Data
+public class ClassifyStatistics {
+
+    private Long classifyId;
+
+    private String classifyName;
+
+    private String bookCount;
+}

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/IpData.java

+package com.pcloud.book.record.entity;
+
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class IpData {
+    private Long id;
+
+    private String ip;
+
+    private String region;
+
+    private String regionId;
+
+    private String city;
+
+    private String cityId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/IpData4Third.java

+package com.pcloud.book.record.entity;
+
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.IpData4Third
+ * @Author 吴博
+ * @Description 第三方查询ip
+ * @Date 2020/6/22 9:08
+ * @Version 1.0
+ **/
+@Data
+public class IpData4Third {
+    private String ip;
+    private String region;
+    private String region_id;
+    private String city;
+    private String city_id;
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/IpResponse.java

+package com.pcloud.book.record.entity;
+
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.record.entity.IpResponse
+ * @Author 吴博
+ * @Description ip返回数据
+ * @Date 2020/6/15 12:46
+ * @Version 1.0
+ **/
+@Data
+public class IpResponse {
+    private IpData4Third data;
+    private String msg;
+    private String ret;
+    private String log_id;
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/MapData.java

+package com.pcloud.book.record.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+
+public class MapData extends BaseEntity {
+
+    private String regionCode;
+
+    private String content;
+
+    public String getRegionCode() {
+        return regionCode;
+    }
+
+    public void setRegionCode(String regionCode) {
+        this.regionCode = regionCode;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/entity/RegionMap.java

+package com.pcloud.book.record.entity;
+
+public class RegionMap {
+    private Long id;
+
+    private Integer regionCode;
+
+    private Integer level;
+
+    private String regionName;
+
+    private String alphabet;
+
+    private Integer parentId;
+
+    private String shortName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getRegionCode() {
+        return regionCode;
+    }
+
+    public void setRegionCode(Integer regionCode) {
+        this.regionCode = regionCode;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName == null ? null : regionName.trim();
+    }
+
+    public String getAlphabet() {
+        return alphabet;
+    }
+
+    public void setAlphabet(String alphabet) {
+        this.alphabet = alphabet == null ? null : alphabet.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName == null ? null : shortName.trim();
+    }
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/facade/BookBrowseRecordFacade.java

+package com.pcloud.book.record.facade;
+
+import com.pcloud.book.book.constant.BookConstant;
+import com.pcloud.book.record.biz.BookBrowseRecordBiz;
+import com.pcloud.book.record.entity.AreaStatistics;
+import com.pcloud.book.record.entity.BookDetail;
+import com.pcloud.book.record.entity.BookDetailDTO;
+import com.pcloud.book.record.entity.BookMapStatistics;
+import com.pcloud.book.record.entity.MapData;
+import com.pcloud.book.record.entity.RegionMap;
+import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.exceptions.BizException;
+import com.pcloud.common.page.PageBeanNew;
+import com.pcloud.common.page.PageParam;
+import com.pcloud.common.permission.PermissionException;
+import com.pcloud.common.utils.SessionUtil;
+import com.pcloud.erp.project.dto.BookDTO;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
+
+/**
+ * @ClassName com.pcloud.book.record.facade.BookBrowseRecordFacade
+ * @Author 吴博
+ * @Description 书籍地图facade
+ * @Date 2020/6/15 13:48
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("bookBrowseRecord")
+public class BookBrowseRecordFacade {
+
+    @Autowired
+    private BookBrowseRecordBiz bookBrowseRecordBiz;
+
+    @GetMapping("getBookCount")
+    public ResponseDto<List<BookMapStatistics>> getBookCount4Country(@RequestHeader("token") String token,
+            @RequestParam(value = "regionCode",required = false) String regionCode) {
+        SessionUtil.getToken4Redis(token);
+        if (Objects.equals(BookConstant.countryRegionCode, regionCode)){
+            regionCode = null;
+        }
+        return new ResponseDto<List<BookMapStatistics>>(bookBrowseRecordBiz.getBookCount4Country(regionCode));
+    }
+
+    @GetMapping("getAreaStatistics")
+    public ResponseDto<AreaStatistics> getAreaStatistics(@RequestHeader("token") String token,
+            @RequestParam(value = "regionCode" ,required = false) String regionCode,
+            @RequestParam("areaCode") Integer areaCode) {
+        SessionUtil.getToken4Redis(token);
+        if (Objects.equals(BookConstant.countryRegionCode, regionCode)){
+            areaCode = BookConstant.countryAreaCode;
+            regionCode = null;
+        }
+        return new ResponseDto<AreaStatistics>(bookBrowseRecordBiz.getAreaStatistics(regionCode, areaCode));
+    }
+
+    @GetMapping("getBookDetail")
+    public ResponseDto<PageBeanNew<BookDetail>> getBookDetail(@RequestHeader("token") String token,
+            @RequestParam("regionCode") String regionCode,
+            @RequestParam("areaCode") Integer areaCode,
+            @RequestParam(value = "currentPage") Integer currentPage,
+            @RequestParam(value = "numPerPage") Integer numPerPage,
+            @RequestParam(value = "bookName", required = false) String bookName,
+            @RequestParam(value = "agentId", required = false) Long agentId,
+            @RequestParam(value = "bookClassifyId", required = false) Long bookClassifyId) {
+        SessionUtil.getToken4Redis(token);
+        if (Objects.equals(BookConstant.countryRegionCode, regionCode)){
+            areaCode = BookConstant.countryAreaCode;
+            regionCode = null;
+        }
+        return new ResponseDto<PageBeanNew<BookDetail>>(bookBrowseRecordBiz.getBookDetail(regionCode, areaCode, new PageParam(currentPage,
+                numPerPage), bookName, agentId, bookClassifyId));
+    }
+
+
+    @GetMapping("addJsonData")
+    public ResponseDto<?> addJsonData(@RequestHeader("token") String token){
+        SessionUtil.getToken4Redis(token);
+        bookBrowseRecordBiz.addJsonData();
+        return  new ResponseDto<>();
+    }
+
+
+    @GetMapping("getJsonData")
+    public ResponseDto<PageBeanNew<MapData>> getJsonData(@RequestHeader("token") String token,
+            @RequestParam(value = "regionCode", required = false) String regionCode,
+            @RequestParam(value = "currentPage") Integer currentPage,
+            @RequestParam(value = "numPerPage") Integer numPerPage){
+        SessionUtil.getToken4Redis(token);
+        PageBeanNew<MapData> mapDataPageBeanNew = bookBrowseRecordBiz.getJsonData(regionCode, currentPage, numPerPage);
+        return  new ResponseDto<>(mapDataPageBeanNew);
+    }
+
+    @ApiOperation(value = "根据期刊社首字母分组", httpMethod = "GET")
+    @RequestMapping(value = "getCitysByPY", method = RequestMethod.GET)
+    ResponseDto<Map<String,List<RegionMap>>> getCitysByPY(@RequestHeader("token") String token,
+            @RequestParam(value = "keyword", required = false) String keyword) throws BizException, PermissionException {
+         SessionUtil.getToken4Redis(token);
+        Map<String,List<RegionMap>>  map= bookBrowseRecordBiz.getCitysByPY(keyword);
+        return   new ResponseDto<>(map);
+    }
+
+    @ApiOperation(value = "处理旧的书刊读者数据", httpMethod = "GET")
+    @RequestMapping(value = "handleOldData", method = RequestMethod.GET)
+    ResponseDto<?> handleOldData(@RequestHeader("token") String token) throws BizException, PermissionException {
+        SessionUtil.getToken4Redis(token);
+        bookBrowseRecordBiz.handleOldData();
+        return new ResponseDto<>();
+    }
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/mapper/BookBrowseRecordMapper.java

+package com.pcloud.book.record.mapper;
+
+
+import com.pcloud.book.record.entity.AreaStatistics;
+import com.pcloud.book.record.entity.BookBrowseRecord;
+import com.pcloud.book.record.entity.BookMapStatistics;
+import com.pcloud.book.record.entity.ClassifyStatistics;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BookBrowseRecordMapper {
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/mapper/IpDataMapper.java

+package com.pcloud.book.record.mapper;
+
+import com.pcloud.book.record.entity.IpData;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IpDataMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpData record);
+
+    int insertSelective(IpData record);
+
+    IpData selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpData record);
+
+    int updateByPrimaryKey(IpData record);
+
+    IpData selectByIp(String ip);
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/mapper/RegionMapMapper.java

+package com.pcloud.book.record.mapper;
+
+import com.pcloud.book.record.entity.RegionMap;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface RegionMapMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(RegionMap record);
+
+    int insertSelective(RegionMap record);
+
+    RegionMap selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(RegionMap record);
+
+    int updateByPrimaryKey(RegionMap record);
+
+    List<RegionMap> getCitysByPY(@Param("keyword") String keyword);
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/record/service/impl/BookBrowseRecordServiceImpl.java

+package com.pcloud.book.record.service.impl;
+
+import com.pcloud.book.book.entity.Book;
+import com.pcloud.book.record.biz.BookBrowseRecordBiz;
+import com.pcloud.book.record.entity.BookBrowseRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName com.pcloud.book.record.service.impl.BookBrowseRecordServiceImpl
+ * @Author 吴博
+ * @Description 书籍浏览埋点内部接口实现类
+ * @Date 2020/6/12 16:10
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("bookBrowseRecordService")
+public class BookBrowseRecordServiceImpl implements BookBrowseRecordService {
+
+    @Autowired
+    private BookBrowseRecordBiz bookBrowseRecordBiz;
+
+    @Override
+    @RequestMapping(value = "addBookRecord", method = RequestMethod.POST)
+    public void addBookRecord(@RequestBody BookBrowseRecord bookBrowseRecord) {
+        bookBrowseRecordBiz.addBookRecord(bookBrowseRecord);
+    }
+
+}
\ No newline at end of file

pcloud-service-book/src/main/resources/generatorConfig.xml

@@ -16,18 +16,18 @@
                         connectionURL="jdbc:mysql://192.168.92.41:3306/book" userId="root"
                         password="LGSC2016.lgsc"/>
 
-        <javaModelGenerator targetPackage="com.pcloud.book.custom.entity"
+        <javaModelGenerator targetPackage="com.pcloud.book.record.entity"
                             targetProject="src\main\java">
             <property name="enableSubPackages" value="true"/>
             <property name="trimStrings" value="true"/>
         </javaModelGenerator>
 
-        <sqlMapGenerator targetPackage="mapper.custom"
+        <sqlMapGenerator targetPackage="mapper.record"
                          targetProject="src\main\resources">
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
 
-        <javaClientGenerator targetPackage="com.pcloud.book.custom.mapper"
+        <javaClientGenerator targetPackage="com.pcloud.book.record.mapper"
                              targetProject="src\main\java" type="XMLMAPPER">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
@@ -38,7 +38,7 @@
                 selectByExampleQueryId="false">
          </table>-->
 
-        <table tableName="custom_rights_item_description" domainObjectName="CustomRightsItemDescription"
+        <table tableName="ip_data" domainObjectName="IpData"
                enableCountByExample="false" enableUpdateByExample="false"
                enableDeleteByExample="false" enableSelectByExample="false"
                selectByExampleQueryId="false">

pcloud-service-book/src/main/resources/mapper/applet/AppletBookClassifyDao.xml

@@ -72,4 +72,28 @@
         WHERE applet_book_classify_id = #{bookClassifyId}
     </select>
 
+    <select id="getAppletBookClassifyId" parameterType="long" resultType="long">
+        select
+        applet_book_classify_id
+        from
+        applet_book_classify_relation
+        where
+        book_templet_id = #{firstClassifyId}
+    </select>
+
+    <select id="getBookClassifyByIds" parameterType="list" resultType="com.pcloud.book.applet.dto.AppletBookClassifyDTO">
+        select
+        id, classify, classify_name classifyName, seq, pic, show_state showState
+        from book.applet_book_classify
+        <where>
+            <if test="list != null">
+                id in
+                <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by seq asc, id asc
+    </select>
+
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml

@@ -700,4 +700,20 @@
 		</if>
 		group by t.BOOK_ID
 	</select>
+
+	<select id="getByBookAdviserIds" resultMap="bookAdviserMap" parameterType="list">
+		SELECT a.BOOK_ADVISER_ID,a.BOOK_ID, a.ADVISER_ID, a.CHANNEL_ID,a.IS_MAIN_EDITOR
+		b.isbn,
+		FROM BOOK_ADVISER a
+		left book b on a.book_Id = b.book_id
+		WHERE
+		BOOK_ID IN
+		<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+			${item}
+		</foreach>
+		AND
+		IS_DELETE = 0
+		GROUP BY BOOK_ID
+	</select>
+
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml

@@ -1033,4 +1033,24 @@
         id = #{id}
     </update>
 
+    <select id="getBookBaseInfoByAdviserBookIds" parameterType="list" resultType="com.pcloud.book.group.dto.BookGroupDTO">
+        SELECT
+        g.id bookGroupId,
+        g.book_id bookId,
+        a.book_adviser_id bookAdviserId,
+        g.group_qrcode_name groupQrcodeName,
+        g.group_qrcode_url groupQrcodeUrl,
+        g.create_time createTime,
+        join_group_type joinGroupType
+        FROM
+        book_group g
+        left join book_adviser a on a.book_id = g.book_id
+        WHERE
+        a.book_adviser_Id
+        in
+        <foreach collection="list" open="(" close=")" item="item" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/record/IpDataMapper.xml

+<?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.pcloud.book.record.mapper.IpDataMapper" >
+  <resultMap id="BaseResultMap" type="com.pcloud.book.record.entity.IpData" >
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="ip" property="ip" jdbcType="VARCHAR" />
+    <result column="region" property="region" jdbcType="VARCHAR" />
+    <result column="region_id" property="regionId" jdbcType="VARCHAR" />
+    <result column="city" property="city" jdbcType="VARCHAR" />
+    <result column="city_id" property="cityId" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, ip, region, region_id, city, city_id, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    select 
+    <include refid="Base_Column_List" />
+    from ip_data
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <select id="selectByIp" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from
+    ip_data
+    where
+    ip = #{ip}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from ip_data
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.pcloud.book.record.entity.IpData" >
+    insert into ip_data (ip, region,
+      region_id, city, city_id, 
+      create_time, update_time)
+    values (#{ip,jdbcType=VARCHAR}, #{region,jdbcType=VARCHAR},
+      #{regionId,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{cityId,jdbcType=VARCHAR}, 
+     now(), now())
+  </insert>
+  <insert id="insertSelective" parameterType="com.pcloud.book.record.entity.IpData" >
+    insert into ip_data
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="ip != null" >
+        ip,
+      </if>
+      <if test="region != null" >
+        region,
+      </if>
+      <if test="regionId != null" >
+        region_id,
+      </if>
+      <if test="city != null" >
+        city,
+      </if>
+      <if test="cityId != null" >
+        city_id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="ip != null" >
+        #{ip,jdbcType=VARCHAR},
+      </if>
+      <if test="region != null" >
+        #{region,jdbcType=VARCHAR},
+      </if>
+      <if test="regionId != null" >
+        #{regionId,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="cityId != null" >
+        #{cityId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.record.entity.IpData" >
+    update ip_data
+    <set >
+      <if test="ip != null" >
+        ip = #{ip,jdbcType=VARCHAR},
+      </if>
+      <if test="region != null" >
+        region = #{region,jdbcType=VARCHAR},
+      </if>
+      <if test="regionId != null" >
+        region_id = #{regionId,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        city = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="cityId != null" >
+        city_id = #{cityId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pcloud.book.record.entity.IpData" >
+    update ip_data
+    set ip = #{ip,jdbcType=VARCHAR},
+      region = #{region,jdbcType=VARCHAR},
+      region_id = #{regionId,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      city_id = #{cityId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/record/MapDataDAO.xml

+<?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.pcloud.book.record.dao.impl.MapDataDAOImpl" >
+  <resultMap id="BaseResultMap" type="com.pcloud.book.record.entity.MapData" >
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="region_code" property="regionCode" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <resultMap id="ResultMapWithBLOBs" type="com.pcloud.book.record.entity.MapData" extends="BaseResultMap" >
+    <result column="content" property="content" jdbcType="LONGVARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, region_code, create_time, content
+  </sql>
+  <sql id="Blob_Column_List" >
+    content
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Long" >
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from map
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from map
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.pcloud.book.record.entity.MapData" >
+    insert into map (region_code, create_time,
+      content)
+    values (#{regionCode,jdbcType=VARCHAR}, #{createtTime,jdbcType=TIMESTAMP},
+      #{content,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.pcloud.book.record.entity.MapData" >
+    insert into map
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="regionCode != null" >
+        region_code,
+      </if>
+      <if test="createtTime != null" >
+        create_time,
+      </if>
+      <if test="content != null" >
+        content,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="regionCode != null" >
+        #{regionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="createtTime != null" >
+        #{createtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null" >
+        #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.record.entity.MapData" >
+    update map
+    <set >
+      <if test="regionCode != null" >
+        region_code = #{regionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="createtTime != null" >
+        create_time = #{createtTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null" >
+        content = #{content,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.pcloud.book.record.entity.MapData" >
+    update map
+    set region_code = #{regionCode,jdbcType=VARCHAR},
+      create_time = #{createtTime,jdbcType=TIMESTAMP},
+      content = #{content,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pcloud.book.record.entity.MapData" >
+    update map
+    set region_code = #{regionCode,jdbcType=VARCHAR},
+      create_time = #{createtTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <insert id="batchInsert" parameterType="com.pcloud.book.record.entity.MapData" >
+    insert into map (region_code, create_time,
+    content)
+    values
+    <foreach collection="list" item="item" index="index" separator="," >
+    (#{item.regionCode,jdbcType=VARCHAR}, now(),
+    #{item.content,jdbcType=LONGVARCHAR})
+    </foreach>
+  </insert>
+  
+  <select id="getJsonData" parameterType="map" resultMap="ResultMapWithBLOBs">
+    select
+    <include refid="Base_Column_List"/>
+    from
+    map
+    <where>
+      <if test="regionCode != null">
+        region_code = #{regionCode}
+      </if>
+    </where>
+    order by region_code asc
+  </select>
+
+</mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/record/RegionMapMapper.xml

+<?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.pcloud.book.record.mapper.RegionMapMapper" >
+  <resultMap id="BaseResultMap" type="com.pcloud.book.record.entity.RegionMap" >
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="region_code" property="regionCode" jdbcType="INTEGER" />
+    <result column="level" property="level" jdbcType="INTEGER" />
+    <result column="region_name" property="regionName" jdbcType="VARCHAR" />
+    <result column="alphabet" property="alphabet" jdbcType="CHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="short_name" property="shortName" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, region_code, level, region_name, alphabet, parent_id, short_name
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+    select 
+    <include refid="Base_Column_List" />
+    from region_map
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <select id="getCitysByPY" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from
+    region_map
+    <where>
+      <if test="keyword != null">
+        region_name like concat("%",#{keyword},"%")
+      </if>
+    </where>
+    order by region_code
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+    delete from region_map
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.pcloud.book.record.entity.RegionMap" >
+    insert into region_map (id, region_code, level, 
+      region_name, alphabet, parent_id, 
+      short_name)
+    values (#{id,jdbcType=BIGINT}, #{regionCode,jdbcType=INTEGER}, #{level,jdbcType=INTEGER}, 
+      #{regionName,jdbcType=VARCHAR}, #{alphabet,jdbcType=CHAR}, #{parentId,jdbcType=INTEGER}, 
+      #{shortName,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.pcloud.book.record.entity.RegionMap" >
+    insert into region_map
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="regionCode != null" >
+        region_code,
+      </if>
+      <if test="level != null" >
+        level,
+      </if>
+      <if test="regionName != null" >
+        region_name,
+      </if>
+      <if test="alphabet != null" >
+        alphabet,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="shortName != null" >
+        short_name,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="regionCode != null" >
+        #{regionCode,jdbcType=INTEGER},
+      </if>
+      <if test="level != null" >
+        #{level,jdbcType=INTEGER},
+      </if>
+      <if test="regionName != null" >
+        #{regionName,jdbcType=VARCHAR},
+      </if>
+      <if test="alphabet != null" >
+        #{alphabet,jdbcType=CHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="shortName != null" >
+        #{shortName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.record.entity.RegionMap" >
+    update region_map
+    <set >
+      <if test="regionCode != null" >
+        region_code = #{regionCode,jdbcType=INTEGER},
+      </if>
+      <if test="level != null" >
+        level = #{level,jdbcType=INTEGER},
+      </if>
+      <if test="regionName != null" >
+        region_name = #{regionName,jdbcType=VARCHAR},
+      </if>
+      <if test="alphabet != null" >
+        alphabet = #{alphabet,jdbcType=CHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="shortName != null" >
+        short_name = #{shortName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.pcloud.book.record.entity.RegionMap" >
+    update region_map
+    set region_code = #{regionCode,jdbcType=INTEGER},
+      level = #{level,jdbcType=INTEGER},
+      region_name = #{regionName,jdbcType=VARCHAR},
+      alphabet = #{alphabet,jdbcType=CHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      short_name = #{shortName,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file