删除gov下的PdManDbVersion模块，修改strangerAccessRecordController的RequestMapping

6 years ago · 28ebd0e0dd
11 changed files with 2 additions and 534 deletions
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java
@ -1,51 +0,0 @@
 /**
 * 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-16
 */
@Data
 public class PdmanDbVersionDTO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 
     */
 	private String dbVersion;
    /**
     * 
     */
 	private String versionDesc;
    /**
     * 
     */
 	private String createdTime;
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
@ -1,94 +0,0 @@
 /**
 * 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.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.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.PdmanDbVersionDTO;
 import com.epmet.excel.PdmanDbVersionExcel;
 import com.epmet.service.PdmanDbVersionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
@RestController
@RequestMapping("pdmandbversion")
 public class PdmanDbVersionController {
    @Autowired
    private PdmanDbVersionService pdmanDbVersionService;
    @GetMapping("page")
    public Result<PageData<PdmanDbVersionDTO>> page(@RequestParam Map<String, Object> params){
        PageData<PdmanDbVersionDTO> page = pdmanDbVersionService.page(params);
        return new Result<PageData<PdmanDbVersionDTO>>().ok(page);
    }
    @GetMapping("{id}")
    public Result<PdmanDbVersionDTO> get(@PathVariable("id") String id){
        PdmanDbVersionDTO data = pdmanDbVersionService.get(id);
        return new Result<PdmanDbVersionDTO>().ok(data);
    }
    @PostMapping
    public Result save(@RequestBody PdmanDbVersionDTO dto){
        //效验数据
        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
        pdmanDbVersionService.save(dto);
        return new Result();
    }
    @PutMapping
    public Result update(@RequestBody PdmanDbVersionDTO dto){
        //效验数据
        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
        pdmanDbVersionService.update(dto);
        return new Result();
    }
    @DeleteMapping
    public Result delete(@RequestBody String[] ids){
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        pdmanDbVersionService.delete(ids);
        return new Result();
    }
    @GetMapping("export")
    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
        List<PdmanDbVersionDTO> list = pdmanDbVersionService.list(params);
        ExcelUtils.exportExcelToTarget(response, null, list, PdmanDbVersionExcel.class);
    }
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
@ -1,33 +0,0 @@
 /**
 * 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.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.PdmanDbVersionEntity;
 import org.apache.ibatis.annotations.Mapper;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
@Mapper
 public interface PdmanDbVersionDao extends BaseDao<PdmanDbVersionEntity> {
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
@ -1,51 +0,0 @@
 /**
 * 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.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("pdman_db_version")
 public class PdmanDbVersionEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
    /**
     * 
     */
 	private String dbVersion;
    /**
     * 
     */
 	private String versionDesc;
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java
@ -1,44 +0,0 @@
 /**
 * 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.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 import java.util.Date;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
@Data
 public class PdmanDbVersionExcel {
    @Excel(name = "")
    private String dbVersion;
    @Excel(name = "")
    private String versionDesc;
    @Excel(name = "")
    private String createdTime;
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
@ -1,47 +0,0 @@
 /**
 * 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.redis;
 import com.epmet.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
@Component
 public class PdmanDbVersionRedis {
    @Autowired
    private RedisUtils redisUtils;
    public void delete(Object[] ids) {
    }
    public void set(){
    }
    public String get(String id){
        return null;
    }
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
@ -1,95 +0,0 @@
 /**
 * 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.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.PdmanDbVersionDTO;
 import com.epmet.entity.PdmanDbVersionEntity;
 import java.util.List;
 import java.util.Map;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
 public interface PdmanDbVersionService extends BaseService<PdmanDbVersionEntity> {
    /**
     * 默认分页
     *
     * @param params
     * @return PageData<PdmanDbVersionDTO>
     * @author generator
     * @date 2020-03-16
     */
    PageData<PdmanDbVersionDTO> page(Map<String, Object> params);
    /**
     * 默认查询
     *
     * @param params
     * @return java.util.List<PdmanDbVersionDTO>
     * @author generator
     * @date 2020-03-16
     */
    List<PdmanDbVersionDTO> list(Map<String, Object> params);
    /**
     * 单条查询
     *
     * @param id
     * @return PdmanDbVersionDTO
     * @author generator
     * @date 2020-03-16
     */
    PdmanDbVersionDTO get(String id);
    /**
     * 默认保存
     *
     * @param dto
     * @return void
     * @author generator
     * @date 2020-03-16
     */
    void save(PdmanDbVersionDTO dto);
    /**
     * 默认更新
     *
     * @param dto
     * @return void
     * @author generator
     * @date 2020-03-16
     */
    void update(PdmanDbVersionDTO dto);
    /**
     * 批量删除
     *
     * @param ids
     * @return void
     * @author generator
     * @date 2020-03-16
     */
    void delete(String[] ids);
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@ -145,7 +145,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
        }
    }
-
+    @Override
    public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
        return new Result<CustomerGridDTO>().ok(baseDao.getCustomerGridByGridId(formDTO));
    }
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
@ -1,104 +0,0 @@
 /**
 * 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.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.PdmanDbVersionDao;
 import com.epmet.dto.PdmanDbVersionDTO;
 import com.epmet.entity.PdmanDbVersionEntity;
 import com.epmet.redis.PdmanDbVersionRedis;
 import com.epmet.service.PdmanDbVersionService;
 import org.apache.commons.lang3.StringUtils;
 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.List;
 import java.util.Map;
 /**
 * 
 *
 * @author generator generator@elink-cn.com
 * @since v1.0.0 2020-03-16
 */
@Service
 public class PdmanDbVersionServiceImpl extends BaseServiceImpl<PdmanDbVersionDao, PdmanDbVersionEntity> implements PdmanDbVersionService {
    @Autowired
    private PdmanDbVersionRedis pdmanDbVersionRedis;
    @Override
    public PageData<PdmanDbVersionDTO> page(Map<String, Object> params) {
        IPage<PdmanDbVersionEntity> page = baseDao.selectPage(
                getPage(params, FieldConstant.CREATED_TIME, false),
                getWrapper(params)
        );
        return getPageData(page, PdmanDbVersionDTO.class);
    }
    @Override
    public List<PdmanDbVersionDTO> list(Map<String, Object> params) {
        List<PdmanDbVersionEntity> entityList = baseDao.selectList(getWrapper(params));
        return ConvertUtils.sourceToTarget(entityList, PdmanDbVersionDTO.class);
    }
    private QueryWrapper<PdmanDbVersionEntity> getWrapper(Map<String, Object> params){
        String id = (String)params.get(FieldConstant.ID_HUMP);
        QueryWrapper<PdmanDbVersionEntity> wrapper = new QueryWrapper<>();
        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
        return wrapper;
    }
    @Override
    public PdmanDbVersionDTO get(String id) {
        PdmanDbVersionEntity entity = baseDao.selectById(id);
        return ConvertUtils.sourceToTarget(entity, PdmanDbVersionDTO.class);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void save(PdmanDbVersionDTO dto) {
        PdmanDbVersionEntity entity = ConvertUtils.sourceToTarget(dto, PdmanDbVersionEntity.class);
        insert(entity);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void update(PdmanDbVersionDTO dto) {
        PdmanDbVersionEntity entity = ConvertUtils.sourceToTarget(dto, PdmanDbVersionEntity.class);
        updateById(entity);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delete(String[] ids) {
        // 逻辑删除（@TableLogic 注解）
        baseDao.deleteBatchIds(Arrays.asList(ids));
    }
 }
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
@ -1,13 +0,0 @@
 <?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.epmet.dao.PdmanDbVersionDao">
    <resultMap type="com.epmet.entity.PdmanDbVersionEntity" id="pdmanDbVersionMap">
        <result property="dbVersion" column="DB_VERSION"/>
        <result property="versionDesc" column="VERSION_DESC"/>
        <result property="createdTime" column="CREATED_TIME"/>
    </resultMap>
 </mapper>
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
@ -27,7 +27,7 @@ import java.util.Map;
 * @date 2020.03.17 11:33
 */
@RestController
-@RequestMapping("strangerAccessRecordController")
+@RequestMapping("strangerAccessRecord")
 public class StrangerAccessRecordController {
    @Autowired