陌生人访问记录表 --和王朝合并版

epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java

@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 陌生人访问记录表 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-19
+ */
+@Data
+public class StrangerAccessRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 定位地区编码 (用户允许获取位置)
+     */
+	private String locationAreaCode;
+
+    /**
+     * 选择地区编码 (用户选择地区位置
+     */
+	private String lelectedAreaCode;
+
+    /**
+     * 省份
+     */
+	private String province;
+
+    /**
+     * 城市
+     */
+	private String city;
+
+    /**
+     * 城市
+     */
+	private String area;
+
+    /**
+     * 是否首次位置授权(0:是 1:否)
+     */
+	private Integer isAuthorized;
+
+    /**
+     * 网格数 根据位置查询到的附近网格数
+     */
+	private Integer gridNumber;
+
+    /**
+     * 访问时间 访问的当前时间
+     */
+	private Date visitTime;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java

@@ -1,17 +1,24 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.dto.result.CustomerGridForStangerResultDTO;
+import com.epmet.excel.StrangerAccessRecordExcel;
 import com.epmet.service.StrangerAccessRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description
@@ -50,4 +57,53 @@ public class StrangerAccessRecordController {
 
         return new Result<List<CustomerGridForStangerResultDTO>>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO));
     }
+    /**
+     *  陌生人列表查询
+     * */
+    @GetMapping("getStrangerAccessRecordPage")
+    public Result<PageData<StrangerAccessRecordDTO>> getStrangerAccessRecordPage(@RequestParam Map<String, Object> params){
+        PageData<StrangerAccessRecordDTO> page = strangerAccessRecordService.getStrangerAccessRecordPage(params);
+        return new Result<PageData<StrangerAccessRecordDTO>>().ok(page);
+    }
+    @GetMapping("page")
+    public Result<PageData<StrangerAccessRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<StrangerAccessRecordDTO> page = strangerAccessRecordService.page(params);
+        return new Result<PageData<StrangerAccessRecordDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<StrangerAccessRecordDTO> get(@PathVariable("id") String id){
+        StrangerAccessRecordDTO data = strangerAccessRecordService.get(id);
+        return new Result<StrangerAccessRecordDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody StrangerAccessRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        strangerAccessRecordService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody StrangerAccessRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        strangerAccessRecordService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        strangerAccessRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<StrangerAccessRecordDTO> list = strangerAccessRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, StrangerAccessRecordExcel.class);
+    }
 }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java

@@ -17,10 +17,14 @@
 
 package com.epmet.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.StrangerAccessRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 陌生人访问记录表 
  *
@@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface StrangerAccessRecordDao extends BaseDao<StrangerAccessRecordEntity> {
-	
+    //陌生人访问记录表
+    List<StrangerAccessRecordEntity> getStrangerAccessRecordPage(Map<String, Object> params);
 }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java

@@ -1,11 +1,14 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.dto.result.CustomerGridForStangerResultDTO;
 import com.epmet.entity.StrangerAccessRecordEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by 11 on 2020/3/17.
@@ -13,6 +16,75 @@ import java.util.List;
 
 public interface StrangerAccessRecordService extends BaseService<StrangerAccessRecordEntity> {
 
+    /**
+     * 陌生人列表查询
+     *
+     * @param params
+     * @return PageData<StrangerAccessRecordDTO>
+     * @author generator
+     * @date 2020-03-19
+     */
+    PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params);
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<StrangerAccessRecordDTO>
+     * @author generator
+     * @date 2020-03-19
+     */
+    PageData<StrangerAccessRecordDTO> page(Map<String, Object> params);
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<StrangerAccessRecordDTO>
+     * @author generator
+     * @date 2020-03-19
+     */
+    List<StrangerAccessRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return StrangerAccessRecordDTO
+     * @author generator
+     * @date 2020-03-19
+     */
+    StrangerAccessRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-19
+     */
+    void save(StrangerAccessRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-03-19
+     */
+    void update(StrangerAccessRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-03-19
+     */
+    void delete(String[] ids);
+
     /**
      *
      * 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@@ -3,9 +3,12 @@ package com.epmet.service.impl;/**
  */
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.StrangerAccessRecordDao;
 import com.epmet.dto.CustomerGridListQueryDTO;
+import com.epmet.dto.StrangerAccessRecordDTO;
 import com.epmet.dto.result.CustomerGridForStangerResultDTO;
 import com.epmet.entity.StrangerAccessRecordEntity;
 import com.epmet.feign.GovOrgFeignClient;
@@ -14,9 +17,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.tools.page.PageData;
+import org.apache.commons.lang3.StringUtils;
+import java.util.Map;
 /**
  * @Description
  * @ClassName ResiGuideServiceImpl
@@ -25,9 +33,66 @@ import java.util.List;
  */
 @Service
 public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAccessRecordDao, StrangerAccessRecordEntity> implements StrangerAccessRecordService {
-
+    @Autowired
+    private StrangerAccessRecordDao strangerAccessRecordDao;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    @Override
+    public PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params) {
+        List<StrangerAccessRecordEntity> list = strangerAccessRecordDao.getStrangerAccessRecordPage(params);
+        return getPageData(list,list.size(), StrangerAccessRecordDTO.class);
+    }
+    @Override
+    public PageData<StrangerAccessRecordDTO> page(Map<String, Object> params) {
+        IPage<StrangerAccessRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, StrangerAccessRecordDTO.class);
+    }
+
+    @Override
+    public List<StrangerAccessRecordDTO> list(Map<String, Object> params) {
+        List<StrangerAccessRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, StrangerAccessRecordDTO.class);
+    }
+
+    private QueryWrapper<StrangerAccessRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<StrangerAccessRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public StrangerAccessRecordDTO get(String id) {
+        StrangerAccessRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, StrangerAccessRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(StrangerAccessRecordDTO dto) {
+        StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(dto, StrangerAccessRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(StrangerAccessRecordDTO dto) {
+        StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(dto, StrangerAccessRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
 
     /**
      *

epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml

@@ -24,4 +24,21 @@
 
 
 
+
+    <!-- 陌生人列表查询-->
+    <select id="getStrangerAccessRecordPage"
+            parameterType="com.epmet.dto.StrangerAccessRecordDTO"  resultMap="strangerAccessRecordMap">
+        SELECT
+        a.LOCATION_AREA_CODE,
+        a.PROVINCE,
+        a.CITY,
+        a.AREA,
+        a.IS_AUTHORIZED,
+        a.VISIT_TIME
+        FROM
+        stranger_access_record AS a
+        where a.DEL_FLAG=0 and  date_sub(curdate(), interval 3 day)  &lt;= a.VISIT_TIME
+        ORDER BY a.VISIT_TIME desc
+    </select>
+
 </mapper>