添加项目相关人员表

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java

@@ -0,0 +1,91 @@
+/**
+ * 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-05-20
+ */
+@Data
+public class ProjectRelatedPersonnelDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键 唯一标识
+     */
+	private String id;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 所属端 居民端用户resi、政府端工作人员gov、运营端工作人员oper
+     */
+	private String app;
+
+    /**
+     * 网格ID app=resi时，此列为gridId,其他情况暂定 *
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectRelatedPersonnelController.java

@@ -0,0 +1,94 @@
+/**
+ * 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.ProjectRelatedPersonnelDTO;
+import com.epmet.excel.ProjectRelatedPersonnelExcel;
+import com.epmet.service.ProjectRelatedPersonnelService;
+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-05-20
+ */
+@RestController
+@RequestMapping("projectrelatedpersonnel")
+public class ProjectRelatedPersonnelController {
+    
+    @Autowired
+    private ProjectRelatedPersonnelService projectRelatedPersonnelService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectRelatedPersonnelDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectRelatedPersonnelDTO> page = projectRelatedPersonnelService.page(params);
+        return new Result<PageData<ProjectRelatedPersonnelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectRelatedPersonnelDTO> get(@PathVariable("id") String id){
+        ProjectRelatedPersonnelDTO data = projectRelatedPersonnelService.get(id);
+        return new Result<ProjectRelatedPersonnelDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectRelatedPersonnelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectRelatedPersonnelService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectRelatedPersonnelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectRelatedPersonnelService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectRelatedPersonnelService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectRelatedPersonnelDTO> list = projectRelatedPersonnelService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectRelatedPersonnelExcel.class);
+    }
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectRelatedPersonnelDao.java

@@ -0,0 +1,44 @@
+/**
+ * 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.dto.ProjectRelatedPersonnelDTO;
+import com.epmet.entity.ProjectRelatedPersonnelEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目相关人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-20
+ */
+@Mapper
+public interface ProjectRelatedPersonnelDao extends BaseDao<ProjectRelatedPersonnelEntity> {
+	/**
+	 * 查找项目关联人员
+	 * @author zhaoqifeng
+	 * @date 2020/5/20 13:45
+	 * @param projectId
+	 * @return java.util.List<com.epmet.dto.ProjectRelatedPersonnelDTO>
+	 */
+	List<ProjectRelatedPersonnelDTO> selectPersonnelListByProjectId(@Param("projectId") String projectId);
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java

@@ -0,0 +1,61 @@
+/**
+ * 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-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_related_personnel")
+public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 所属端 居民端用户resi、政府端工作人员gov、运营端工作人员oper
+     */
+	private String app;
+
+    /**
+     * 网格ID app=resi时，此列为gridId,其他情况暂定 *
+     */
+	private String gridId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectRelatedPersonnelExcel.java

@@ -0,0 +1,68 @@
+/**
+ * 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-05-20
+ */
+@Data
+public class ProjectRelatedPersonnelExcel {
+
+    @Excel(name = "主键 唯一标识")
+    private String id;
+
+    @Excel(name = "项目ID")
+    private String projectId;
+
+    @Excel(name = "所属端 居民端用户resi、政府端工作人员gov、运营端工作人员oper")
+    private String app;
+
+    @Excel(name = "网格ID app=resi时，此列为gridId,其他情况暂定 *")
+    private String gridId;
+
+    @Excel(name = "用户ID")
+    private String userId;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectRelatedPersonnelRedis.java

@@ -0,0 +1,47 @@
+/**
+ * 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-05-20
+ */
+@Component
+public class ProjectRelatedPersonnelRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectRelatedPersonnelService.java

@@ -0,0 +1,95 @@
+/**
+ * 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.ProjectRelatedPersonnelDTO;
+import com.epmet.entity.ProjectRelatedPersonnelEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目相关人员表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-20
+ */
+public interface ProjectRelatedPersonnelService extends BaseService<ProjectRelatedPersonnelEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectRelatedPersonnelDTO>
+     * @author generator
+     * @date 2020-05-20
+     */
+    PageData<ProjectRelatedPersonnelDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectRelatedPersonnelDTO>
+     * @author generator
+     * @date 2020-05-20
+     */
+    List<ProjectRelatedPersonnelDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectRelatedPersonnelDTO
+     * @author generator
+     * @date 2020-05-20
+     */
+    ProjectRelatedPersonnelDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-20
+     */
+    void save(ProjectRelatedPersonnelDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-05-20
+     */
+    void update(ProjectRelatedPersonnelDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-05-20
+     */
+    void delete(String[] ids);
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectRelatedPersonnelServiceImpl.java

@@ -0,0 +1,104 @@
+/**
+ * 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.ProjectRelatedPersonnelDao;
+import com.epmet.dto.ProjectRelatedPersonnelDTO;
+import com.epmet.entity.ProjectRelatedPersonnelEntity;
+import com.epmet.redis.ProjectRelatedPersonnelRedis;
+import com.epmet.service.ProjectRelatedPersonnelService;
+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-05-20
+ */
+@Service
+public class ProjectRelatedPersonnelServiceImpl extends BaseServiceImpl<ProjectRelatedPersonnelDao, ProjectRelatedPersonnelEntity> implements ProjectRelatedPersonnelService {
+
+    @Autowired
+    private ProjectRelatedPersonnelRedis projectRelatedPersonnelRedis;
+
+    @Override
+    public PageData<ProjectRelatedPersonnelDTO> page(Map<String, Object> params) {
+        IPage<ProjectRelatedPersonnelEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectRelatedPersonnelDTO.class);
+    }
+
+    @Override
+    public List<ProjectRelatedPersonnelDTO> list(Map<String, Object> params) {
+        List<ProjectRelatedPersonnelEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectRelatedPersonnelDTO.class);
+    }
+
+    private QueryWrapper<ProjectRelatedPersonnelEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectRelatedPersonnelEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectRelatedPersonnelDTO get(String id) {
+        ProjectRelatedPersonnelEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectRelatedPersonnelDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectRelatedPersonnelDTO dto) {
+        ProjectRelatedPersonnelEntity entity = ConvertUtils.sourceToTarget(dto, ProjectRelatedPersonnelEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectRelatedPersonnelDTO dto) {
+        ProjectRelatedPersonnelEntity entity = ConvertUtils.sourceToTarget(dto, ProjectRelatedPersonnelEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml

@@ -0,0 +1,30 @@
+<?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.ProjectRelatedPersonnelDao">
+
+    <resultMap type="com.epmet.entity.ProjectRelatedPersonnelEntity" id="projectRelatedPersonnelMap">
+        <result property="id" column="ID"/>
+        <result property="projectId" column="PROJECT_ID"/>
+        <result property="app" column="APP"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <select id="selectPersonnelListByProjectId" resultType="com.epmet.dto.ProjectRelatedPersonnelDTO">
+        SELECT
+            *
+        FROM
+            project_related_personnel
+        WHERE
+            DEL_FLAG = '0'
+        AND PROJECT_ID = #{projectId}
+    </select>
+
+
+</mapper>