代码回滚模块

esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql

@@ -1,52 +0,0 @@
---------标记一下这个已经随工作端上线
-ALTER TABLE esua_epdc_user.epdc_party_authentication_failed MODIFY COLUMN `STATE` VARCHAR(1) NULL COMMENT '状态 0-认证失败';
-ALTER TABLE esua_epdc_user.epdc_party_authentication_failed MODIFY COLUMN `CADRE_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 0 NULL COMMENT '干部下沉标识 0-否，1-是';
-ALTER TABLE esua_epdc_user.epdc_user_authenticate_history ADD AUTHENTICATED_TYPE varchar(2) NOT NULL COMMENT '认证类别(0-居民认证，1-党员认证，2-志愿者认证)';
-------------------------------------------------
-
-CREATE TABLE `epdc_handle_category` (
-  `ID` varchar(32) NOT NULL COMMENT '主键',
-  `CATEGORY_VAL` int(11) NOT NULL COMMENT '处理类别值',
-  `CATEGORY_LABEL` varchar(20) NOT NULL COMMENT '处理类别显示信息',
-  `AVAILABLE` varchar(1) NOT NULL DEFAULT '1' COMMENT '可用状态(0-不可用，1-可用)',
-  `SORT` int(11) NOT NULL DEFAULT '0' COMMENT '排序',
-  `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
-  `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人',
-  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
-  `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人',
-  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
-  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识 0：未删除，1：已删除',
-  `CATEGORY_CODE` varchar(32) NOT NULL COMMENT '处理类型编码',
-  PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='处理类别表'
-
-
-CREATE TABLE `epdc_role_category` (
-  `ID` varchar(32) NOT NULL COMMENT '主键',
-  `ROLE_ID` varchar(32) NOT NULL COMMENT '角色ID',
-  `CATEGORY_ID` varchar(32) NOT NULL COMMENT '处理类别ID',
-  `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
-  `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人',
-  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
-  `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人',
-  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
-  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识 0：未删除，1：已删除',
-  PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和处理类别关系表'
-
-
-ALTER TABLE EPDC_HANDLE_ROLE_CATEGORY COMMENT '角色和处理类别关系表';;
-CREATE TABLE EPDC_HANDLE_ROLE_DEPT(
-    ID VARCHAR(32) NOT NULL   COMMENT '主键' ,
-    ROLE_ID VARCHAR(32) NOT NULL   COMMENT '角色ID' ,
-    DEPT_ID VARCHAR(32) NOT NULL   COMMENT '部门ID' ,
-    DEPT_TYPE VARCHAR(50) NOT NULL   COMMENT '部门机构类型' ,
-    REVISION INT    COMMENT '乐观锁' ,
-    CREATED_BY VARCHAR(32)    COMMENT '创建人' ,
-    CREATED_TIME DATETIME    COMMENT '创建时间' ,
-    UPDATED_BY VARCHAR(32)    COMMENT '更新人' ,
-    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
-    PRIMARY KEY (ID)
-) COMMENT = '处理部门角色权限表 处理部门角色权限表';;
-
-ALTER TABLE EPDC_HANDLE_ROLE_DEPT COMMENT '处理部门角色权限表';;

esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml

@@ -6,8 +6,8 @@ services:
       - 443:443
     volumes:
       - /mnt/nginx/html:/usr/share/nginx/html
-      - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro
+      - /mnt/nginx/conf.d:/etc/nginx/conf.d
       - /mnt/nginx/logs:/var/log/nginx
     restart: always
     container_name: nginx_master

esua-epdc/docker-compose/prod/nginx/docker-compose.yml

@@ -1,14 +0,0 @@
-version: '3.7'
-services:
-  web:
-    image: nginx
-    ports:
-      - 443:443
-    volumes:
-      - /mnt/nginx/html:/usr/share/nginx/html
-      - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro
-      - /mnt/nginx/logs:/var/log/nginx
-    restart: always
-    container_name: nginx_master
-

esua-epdc/docker-compose/test/nginx/docker-compose.yml

@@ -1,15 +0,0 @@
-version: '3.7'
-services:
-  web:
-    image: nginx
-    ports:
-      - 443:443
-    volumes:
-      - /opt/docker/nginx/html:/usr/share/nginx/html
-      - /opt/docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /opt/docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - /opt/docker/nginx/logs:/var/log/nginx
-      - /opt/docker/nginx/cert:/etc/nginx/cert:ro
-    restart: always
-    container_name: nginx_master
-

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java

@@ -1,15 +0,0 @@
-package com.elink.esua.epdc.constant;
-
-/**
- * TypeKey 常量
- *
- * @author work@yujt.net.cn
- * @date 2019/12/18 10:10
- */
-public interface RoleTypeKeyConstant {
-
-    /**
-     * 角色：网格长
-     */
-    String ROLE_GRID_LEADER = "gridLeader";
-}

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java

@@ -1,50 +0,0 @@
-package com.elink.esua.epdc.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 机构层级关系与机构负责人
- *
- * @author work@yujt.net.cn
- * @date 2019/12/18 10:55
- */
-@Data
-public class DeptLevelAndLeaderDTO implements Serializable {
-
-    private static final long serialVersionUID = 8264059305193996215L;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-    /**
-     * 部门名称
-     */
-    private String deptName;
-    /**
-     * 父所有部门ID
-     */
-    private String parentDeptIds;
-    /**
-     * 父所有部门
-     */
-    private String parentDeptNames;
-    /**
-     * 所有部门ID
-     */
-    private String allDeptIds;
-    /**
-     * 所有部门名称
-     */
-    private String allDeptNames;
-    /**
-     * 部门负责人名称
-     */
-    private String leaderName;
-    /**
-     * 部门负责人名称
-     */
-    private String typeKey;
-}

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java

@@ -72,14 +72,4 @@ public class SysRoleDTO implements Serializable {
      * app菜单ID列表
      */
     private List<Long> appMenuIdList;
-
-    /**
-     * 项目处理类型授权id列表
-     */
-    private List<String> categoryIdList;
-
-    /**
-     * 吹哨部门id列表
-     */
-    private List<Long> whistleDeptIdList;
 }

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java

@@ -28,6 +28,4 @@ public class SysSimpleDictDTO implements Serializable {
     @ApiModelProperty(value = "字典值")
     private String dictValue;
 
-    @ApiModelProperty(value = "备注")
+}
-    private String remark;
-}

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java

@@ -16,10 +16,14 @@ public class UserSysDeptInfoFormDTO implements Serializable {
 	/**
 	 * 主键集合
 	 */
+//	@NotEmpty(message = "deptIdList不能为空")
+//	@Valid
 	private List<Long> deptIdList;
 
 	/**
 	 * 部门类型键值
 	 */
+//	@NotEmpty(message = "部门类型不能为空")
+//	@Valid
 	private List<String> typeKeyList;
 }

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -62,12 +62,6 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-events-client</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -131,7 +131,6 @@ public class SysDeptController {
     public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") String gridId) {
         return sysDeptService.getCompleteDept(gridId);
     }
-
     /**
      * 通过网格ID获取该网格所有上级机构
      *
@@ -142,7 +141,7 @@ public class SysDeptController {
      */
     @GetMapping("getParentAndAllDept/{deptId}")
     public Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId) {
-        return new Result().ok(sysDeptService.getParentAndAllDept(deptId));
+        return sysDeptService.getParentAndAllDept(deptId);
     }
 
     /**
@@ -235,49 +234,4 @@ public class SysDeptController {
         PageData<CompleteDeptDTO> page = sysDeptService.listCompleteDeptDTO(params);
         return new Result<PageData<CompleteDeptDTO>>().ok(page);
     }
-
-    /***
-     * 获取所有网格 kpi模块原始数据
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author qushutong
-     * @date 2019/12/12 17:26
-     */
-    @GetMapping("listAllGridId")
-    public Result listAllGridId() {
-        return sysDeptService.listAllGridId();
-    }
-
-    /**
-     * 按部门类型，分页查询部门列表
-     *
-     * @param typeKey   部门类型
-     * @param pageSize  页容量
-     * @param pageIndex 页码
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author work@yujt.net.cn
-     * @date 2019/12/17 16:03
-     */
-    @GetMapping("pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}")
-    public Result<List<Long>> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey,
-                                                  @PathVariable("pageSize") Integer pageSize,
-                                                  @PathVariable("pageIndex") Integer pageIndex) {
-        return sysDeptService.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex);
-    }
-
-
-    /**
-     * 根据部门id，获取部门层级关系，获取部门领导姓名
-     *
-     * @param deptId     部门id
-     * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO>
-     * @author work@yujt.net.cn
-     * @date 2019/12/18 11:04
-     */
-    @GetMapping("getDeptInfoById/{deptId}/{leaderFlag}")
-    public Result<DeptLevelAndLeaderDTO> getDeptInfoById(@PathVariable("deptId") Long deptId,
-                                                         @PathVariable("leaderFlag") String leaderFlag) {
-        DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag);
-        return new Result<DeptLevelAndLeaderDTO>().ok(dto);
-    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java

@@ -93,14 +93,6 @@ public class SysRoleController {
         List<Long> appMenuIdList = appRoleMenuService.getAppMenuIdList(id);
         data.setAppMenuIdList(appMenuIdList);
 
-        //查询角色对应的项目处理类型权限
-        List<String> categoryIdList = sysRoleService.getCategoryIdList(id);
-        data.setCategoryIdList(categoryIdList);
-
-        //查询角色对应的吹哨部门
-        List<Long> whistleDeptIdList=sysRoleService.getWhistleDeptIdList(id);
-        data.setWhistleDeptIdList(whistleDeptIdList);
-
         return new Result<SysRoleDTO>().ok(data);
     }
 

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -88,20 +88,6 @@ public class SysUserController {
         return new Result<SysUserDTO>().ok(data);
     }
 
-    /**
-     * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
-     * @Author yinzuomei
-     * @Description 查询用户角色Id
-     * @Date 2020/2/3 8:13
-     **/
-    @GetMapping("getRoleIdList/{userId}")
-    public Result<List<Long>> getRoleIdList(@PathVariable("userId") Long userId) {
-        //用户角色列表
-        List<Long> roleIdList = sysRoleUserService.getRoleIdList(userId);
-        return new Result<List<Long>>().ok(roleIdList);
-    }
-
     @GetMapping("info")
     @ApiOperation("登录用户信息")
     public Result<SysUserDTO> info(@ApiIgnore UserDetail user) {

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -9,7 +9,6 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.DeptTreeDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
@@ -157,39 +156,4 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<CompleteDeptDTO> selectListCompleteDeptDTO(Map<String, Object> params);
 
     List<DeptTreeDTO> selectListDeptTreeForEpiDemic();
-
-
-    /***
-     * 查询所有网格
-     * @param
-     * @return java.util.List<java.lang.Long>
-     * @author qushutong
-     * @date 2019/12/12 18:12
-     */
-    List<Long> selectListAllGridId();
-
-    /**
-     * 按部门类型，分页查询部门列表
-     *
-     * @param typeKey   部门类型
-     * @param pageSize  页容量
-     * @param pageIndex 页码
-     * @return java.util.List<java.lang.Long>
-     * @author work@yujt.net.cn
-     * @date 2019/12/17 16:11
-     */
-    List<Long> pageDeptIdByTypeKey(@Param("typeKey") String typeKey,
-                                   @Param("pageSize") Integer pageSize,
-                                   @Param("pageIndex") Integer pageIndex);
-
-    /**
-     * 根据部门id，查询该部门指定角色的用户姓名
-     *
-     * @param deptId   部门id
-     * @param roleType 角色类型
-     * @return java.lang.String
-     * @author work@yujt.net.cn
-     * @date 2019/12/18 13:45
-     */
-    String selectDeptLeaderName(@Param("deptId") Long deptId, @Param("roleType") String roleType);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- * <p>
+ *
  * https://www.renren.io
- * <p>
+ *
  * 版权所有，侵权必究！
  */
 
@@ -12,10 +12,6 @@ import com.elink.esua.epdc.entity.SysRoleEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.entity.SysRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * 角色管理
@@ -26,14 +22,4 @@ import java.util.Map;
 @Mapper
 public interface SysRoleDao extends BaseDao<SysRoleEntity> {
 
-    /**
-     * 根据角色类型，获取机构的此类角色数量
-     *
-     * @param roleType
-     * @param deptIdList
-     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
-     * @author work@yujt.net.cn
-     * @date 2019/12/18 10:20
-     */
-    List<Map<String, Object>> selectAmountByRoleTpye(@Param("roleType") String roleType, @Param("deptIdList") List<Long> deptIdList);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java

@@ -1,63 +0,0 @@
-package com.elink.esua.epdc.feign;
-
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO;
-import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO;
-import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/24 09:28
- * @Description: 事件接口
- */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class)
-public interface EventFeignClient {
-
-	/**
-	 * @param orgTypeFormDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 保存项目处理类型权限
-	 * @Date 2019/12/24 17:17
-	 **/
-	@PostMapping(value = "events/handlerolecategory/saveOrUpdate", consumes = MediaType.APPLICATION_JSON_VALUE)
-	Result saveOrUpdateHandleCategory(HandleRoleCategoryFormDTO orgTypeFormDTO);
-
-	/**
-	 * @param roleId
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
-	 * @Author yinzuomei
-	 * @Description 查询角色对应的项目处理类型权限
-	 * @Date 2019/12/24 17:17
-	 **/
-	@GetMapping(value = "events/handlerolecategory/queryCategoryIdList/{roleId}")
-	Result<List<String>> queryCategoryIdList(@PathVariable("roleId") Long roleId);
-
-	/**
-	 * @param formDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 保存角色对应可吹哨部门权限
-	 * @Date 2019/12/26 14:09
-	 **/
-	@PostMapping(value = "events/handleroledept/saveOrUpdate", consumes = MediaType.APPLICATION_JSON_VALUE)
-	Result saveOrUpdateHandleRoleDept(HandleRoleDeptFormDTO formDTO);
-
-	/**
-	 * @param roleId
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
-	 * @Author yinzuomei
-	 * @Description 查询角色对应可吹哨部门权限
-	 * @Date 2019/12/26 14:09
-	 **/
-	@GetMapping(value = "events/handleroledept/queryWhistleDeptIdList/{roleId}")
-	Result<List<Long>> queryWhistleDeptIdList(@PathVariable("roleId")Long roleId);
-}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java

@@ -1,41 +0,0 @@
-package com.elink.esua.epdc.feign.fallback;
-
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO;
-import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO;
-import com.elink.esua.epdc.feign.EventFeignClient;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author yinzuomei
- * @Date 2019/12/24 9:45
- */
-@Component
-public class EventFeignClientFallback implements EventFeignClient {
-
-	@Override
-	public Result saveOrUpdateHandleCategory(HandleRoleCategoryFormDTO orgTypeFormDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "saveOrUpdate", orgTypeFormDTO);
-	}
-
-	@Override
-	public Result<List<String>> queryCategoryIdList(Long roleId) {
-		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryCategoryIdList", roleId);
-	}
-
-	@Override
-	public Result saveOrUpdateHandleRoleDept(HandleRoleDeptFormDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "saveOrUpdate", formDTO);
-	}
-
-	@Override
-	public Result<List<Long>> queryWhistleDeptIdList(Long roleId) {
-		return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryWhistleDeptIdList", roleId);
-	}
-
-}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java

@@ -36,7 +36,4 @@ public interface SysRoleService extends BaseService<SysRoleEntity> {
 
     void delete(Long[] ids);
 
-    List<String> getCategoryIdList(Long id);
-
-    List<Long> getWhistleDeptIdList(Long id);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -18,9 +18,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
-import com.elink.esua.epdc.commons.tools.constant.*;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
-import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
@@ -32,7 +30,6 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
-import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
 import com.elink.esua.epdc.dao.SysDeptDao;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
@@ -252,7 +249,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
     @Override
-    public ParentAndAllDeptDTO getParentAndAllDept(String deptId) {
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId) {
         Long deptIdL = null;
         try {
             deptIdL = Long.parseLong(deptId.trim());
@@ -260,7 +257,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             log.error("->getCompleteDept:::部门ID格式转换异常:::deptId->{}", deptId);
         }
         if (null == deptIdL) {
-            throw new RenException("参数格式异常");
+            return new Result().error("参数格式异常");
         }
         CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(deptIdL);
         ParentAndAllDeptDTO parentAndAllDeptDTO = new ParentAndAllDeptDTO();
@@ -283,11 +280,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             parentAndAllDeptDTO.setAllDeptIds(deptIds);
             parentAndAllDeptDTO.setAllDeptNames(deptNames);
         } else {
-            throw new RenException("部门Id错误");
+            return new Result().error("部门Id错误");
         }
 
 
-        return parentAndAllDeptDTO;
+        return new Result().ok(parentAndAllDeptDTO);
     }
 
     @Override
@@ -787,71 +784,4 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         List<CompleteDeptDTO> userDtoList = this.baseDao.selectListCompleteDeptDTO(params);
         return new PageData<>(userDtoList, iPage.getTotal());
     }
-
-    @Override
-    public Result<List<Long>> listAllGridId() {
-        List<Long> gridIdList = baseDao.selectListAllGridId();
-
-        return new Result<List<Long>>().ok(gridIdList);
-    }
-
-    @Override
-    public Result<List<Long>> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) {
-        if (null == pageSize || null == pageIndex || pageSize < NumConstant.ONE || pageIndex < NumConstant.ONE) {
-            return new Result().error("参数错误");
-        }
-        pageIndex = (pageIndex - NumConstant.ONE) * pageSize;
-        List<Long> deptIdList = baseDao.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex);
-        return new Result().ok(deptIdList);
-    }
-
-    @Override
-    public DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag) {
-        if (null == deptId || null == leaderFlag) {
-            return null;
-        }
-        SysDeptEntity sysDeptEntity = baseDao.selectById(deptId);
-        if (null == sysDeptEntity) {
-            return null;
-        }
-        String deptName = sysDeptEntity.getName();
-        String pids = sysDeptEntity.getPids();
-        // 上级机构id
-        String parentDeptIds = NumConstant.ZERO_STR.equals(pids) ? "" : pids;
-        // 全部机构id
-        String allDeptIds = StringUtils.isBlank(pids) ? String.valueOf(deptId) :
-                pids.concat(StrConstant.COMMA).concat(String.valueOf(deptId));
-
-        // 上级机构名称
-        String parentDeptNames = "";
-        if (StringUtils.isNotBlank(parentDeptIds)) {
-            String[] pidArray = parentDeptIds.split(StrConstant.COMMA);
-            List<String> deptNameList = Lists.newArrayList();
-            SysDeptEntity dept;
-            for (int i = 0; i < pidArray.length; i++) {
-                dept = baseDao.selectById(Long.parseLong(pidArray[i]));
-                deptNameList.add(dept.getName());
-            }
-            parentDeptNames = StringUtils.join(deptNameList, StrConstant.HYPHEN);
-        }
-        // 全部机构名称
-        String allDeptNames = StringUtils.isBlank(parentDeptNames) ? deptName : parentDeptNames.concat(StrConstant.HYPHEN).concat(deptName);
-
-        DeptLevelAndLeaderDTO deptLevel = new DeptLevelAndLeaderDTO();
-        deptLevel.setDeptId(deptId);
-        deptLevel.setDeptName(deptName);
-        deptLevel.setParentDeptIds(parentDeptIds);
-        deptLevel.setParentDeptNames(parentDeptNames);
-        deptLevel.setAllDeptIds(allDeptIds);
-        deptLevel.setAllDeptNames(allDeptNames);
-        deptLevel.setTypeKey(sysDeptEntity.getTypeKey());
-
-        if (YesOrNoEnum.YES.value().equals(leaderFlag)) {
-            String leaderName = baseDao.selectDeptLeaderName(deptId, RoleTypeKeyConstant.ROLE_GRID_LEADER);
-            deptLevel.setLeaderName(leaderName);
-        }
-
-        redisUtils.set(RedisKeys.getDeptOptionKey(deptId), deptLevel);
-        return deptLevel;
-    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java

@@ -134,7 +134,7 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
                 }
 
                 QueryWrapper<SysDictEntity> sdWrapper = new QueryWrapper<>();
-                sdWrapper.select("dict_value", "dict_name","remark");
+                sdWrapper.select("dict_value", "dict_name");
                 sdWrapper.eq("dict_type", dictType);
                 sdWrapper.ne("dict_value", "");
                 sdWrapper.isNotNull("dict_value");

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java

@@ -8,40 +8,25 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.commons.tools.constant.NumConstant;
-import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dao.SysDeptDao;
-import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
 import com.elink.esua.epdc.dao.SysRoleDao;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysRoleDTO;
-import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO;
-import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO;
-import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO;
-import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.entity.SysRoleEntity;
-import com.elink.esua.epdc.feign.EventFeignClient;
 import com.elink.esua.epdc.service.*;
 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.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -64,12 +49,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     @Autowired
     private AppRoleMenuService appRoleMenuService;
 
-    @Autowired
-    private EventFeignClient eventFeignClient;
-
-    @Autowired
-    private SysDeptDao sysDeptDao;
-
     @Override
     public PageData<SysRoleDTO> page(Map<String, Object> params) {
         IPage<SysRoleEntity> page = baseDao.selectPage(
@@ -122,8 +101,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     public void save(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
-        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
-
         //保存角色
         insert(entity);
 
@@ -135,51 +112,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 
         //保存角色与app菜单关系
         appRoleMenuService.saveOrUpdate(entity.getId(), dto.getAppMenuIdList());
-
-        //保存角色与项目处理类型关系
-        HandleRoleCategoryFormDTO categoryFormDTO = new HandleRoleCategoryFormDTO();
-        categoryFormDTO.setRoleId(entity.getId());
-        categoryFormDTO.setCategoryIdList(dto.getCategoryIdList());
-        eventFeignClient.saveOrUpdateHandleCategory(categoryFormDTO);
-
-        //保存角色对应的可吹哨部门权限
-        this.saveOrUpdateWhistleDeptId(entity.getId(), dto.getWhistleDeptIdList());
-    }
-
-    /**
-     * 根据角色类型，获取机构的此类角色数量
-     *
-     * @param roleType   角色类型
-     * @param deptidList 机构id列表
-     * @return void
-     * @author work@yujt.net.cn
-     * @date 2019/12/18 10:14
-     */
-    private void checkDeptRoleAmount(String roleType, List<Long> deptidList) {
-        if (RoleTypeKeyConstant.ROLE_GRID_LEADER.equals(roleType)) {
-            List<Map<String, Object>> resultList = baseDao.selectAmountByRoleTpye(roleType, deptidList);
-            if (CollUtil.isEmpty(resultList)) {
-                return;
-            }
-            Map<String, Object> map;
-            String mapValue;
-            for (int i = 0; i < resultList.size(); i++) {
-                map = resultList.get(i);
-
-                mapValue = map.get("typeKey").toString();
-                if (!mapValue.equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
-                    continue;
-                }
-
-                mapValue = map.get("amount").toString();
-                if (Integer.parseInt(mapValue) <= NumConstant.THREE) {
-                    continue;
-                }
-                mapValue = map.get("id").toString();
-                ParentAndAllDeptDTO parentAndAllDept = sysDeptService.getParentAndAllDept(mapValue);
-                throw new RenException("保存失败：" + parentAndAllDept.getAllDeptNames() + "，网格长多于3人");
-            }
-        }
     }
 
     @Override
@@ -198,15 +130,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 
         //更新角色与app菜单关系
         appRoleMenuService.saveOrUpdate(entity.getId(), dto.getAppMenuIdList());
-
-        //保存角色与项目处理类型关系
-        HandleRoleCategoryFormDTO categoryFormDTO = new HandleRoleCategoryFormDTO();
-        categoryFormDTO.setRoleId(entity.getId());
-        categoryFormDTO.setCategoryIdList(dto.getCategoryIdList());
-        eventFeignClient.saveOrUpdateHandleCategory(categoryFormDTO);
-
-        //保存角色对应的可吹哨部门权限
-        this.saveOrUpdateWhistleDeptId(entity.getId(), dto.getWhistleDeptIdList());
     }
 
     @Override
@@ -221,50 +144,4 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         //[角色菜单关系、角色数据权限关系、App菜单授权]，需要保留，不然逻辑删除就变成物理删除了
     }
 
-    /**
-     * @param id
-     * @return java.util.List<java.lang.String>
-     * @Author yinzuomei
-     * @Description 查询角色对应的项目处理类型权限
-     * @Date 2019/12/24 16:03
-     **/
-    @Override
-    public List<String> getCategoryIdList(Long id) {
-        Result<List<String>> result = eventFeignClient.queryCategoryIdList(id);
-        return result.getData();
-    }
-
-    @Override
-    public List<Long> getWhistleDeptIdList(Long id) {
-        Result<List<Long>> result = eventFeignClient.queryWhistleDeptIdList(id);
-        return result.getData();
-    }
-
-    /**
-     * @param roleId
-     * @param whistleDeptIdList
-     * @return void
-     * @Author yinzuomei
-     * @Description
-     * @Date 2019/12/26 13:22
-     **/
-    private void saveOrUpdateWhistleDeptId(Long roleId, List<Long> whistleDeptIdList) {
-        HandleRoleDeptFormDTO formDTO = new HandleRoleDeptFormDTO();
-        formDTO.setRoleId(roleId.toString());
-
-        QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
-        wrapper.in(FieldConstant.ID, whistleDeptIdList);
-        List<SysDeptEntity> deptEntityList = sysDeptDao.selectList(wrapper);
-        List<HandleRoleDeptDTO> formDTOList = new ArrayList<>();
-        for (SysDeptEntity dept : deptEntityList) {
-            HandleRoleDeptDTO handleRoleDeptDTO = new HandleRoleDeptDTO();
-            handleRoleDeptDTO.setDeptId(dept.getId().toString());
-            handleRoleDeptDTO.setDeptName(dept.getName());
-            handleRoleDeptDTO.setDeptType(dept.getTypeKey());
-            handleRoleDeptDTO.setRoleId(roleId.toString());
-            formDTOList.add(handleRoleDeptDTO);
-        }
-        formDTO.setHandleRoleDeptDTOList(formDTOList);
-        eventFeignClient.saveOrUpdateHandleRoleDept(formDTO);
-    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -191,7 +191,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     public Result<GridLeaderRegisterDTO> listGridWhileLeaderRegister(String mobile) {
-        //TODO:该方法的获取组织结构不灵活，得重构   create by rongchao
+
         QueryWrapper<SysUserEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(FieldConstant.MOBILE, mobile)
                 .eq(FieldConstant.DEL_FLAG, DelFlagEnum.NORMAL.value());

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -5,7 +5,7 @@
 
     <select id="getList" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
         select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
-        where t1.del_flag = 0
+            where t1.del_flag = 0
         <if test="deptIdList != null">
             and t1.id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
@@ -138,7 +138,7 @@
             sys_dept d
             LEFT JOIN sys_dept d1 ON d.pids LIKE CONCAT( '%', d1.id, '%' )
         WHERE
-            d.id IN <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
+            d.id IN <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>
             AND d1.pid = 0
         GROUP BY d1.id
         ORDER BY d1.create_date ASC
@@ -147,8 +147,8 @@
         SELECT
             tem2.*
         FROM
-            ( SELECT * FROM sys_dept d1 WHERE d1.id IN <foreach collection="dataScopeDeptList" item="item" open="(" separator="," close=")">#{item}</foreach> ) tem1,
+            ( SELECT * FROM sys_dept d1 WHERE d1.id IN <foreach collection="dataScopeDeptList" item="item" open="(" separator="," close=")" > #{item} </foreach> ) tem1,
-            ( SELECT * FROM sys_dept d2 WHERE d2.pid IN <foreach collection="parentDeptIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>) tem2
+            ( SELECT *  FROM sys_dept d2 WHERE d2.pid IN <foreach collection="parentDeptIdList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>) tem2
         WHERE
             ( tem1.PIDS LIKE CONCAT( '%', tem2.id, '%' ) OR tem1.PID = tem2.ID )
             OR ( tem2.ID = tem1.ID AND NOT EXISTS ( SELECT 1 FROM sys_dept d WHERE d.PID = tem2.ID ) )
@@ -160,66 +160,35 @@
     <select id="selectListUserSysDeptInfo" parameterType="com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO"
             resultType="com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO">
         SELECT
-        sd.id,
+            sd.id,
-        sd.NAME,
+            sd.NAME,
-        sd.pid,
+            sd.pid,
-        p.NAME AS parentName,
+            p.NAME AS parentName,
-        sd.pids,
+            sd.pids,
-        NULL AS parentNames,
+            NULL AS parentNames,
-        null as street,
+            null as street,
-        null as community,
+            null as community,
-        (case
+            (case
-        when sd.type_key='grid_party' then sd.name
+            when sd.type_key='grid_party' then sd.name
-        else null
+            else null
-        end) as grid
+            end) as grid
-        FROM
-        sys_dept sd
-        LEFT JOIN sys_dept p ON ( sd.pid = p.id )
-        WHERE
-        sd.del_flag = '0'
-        <if test="typeKeyList!=null and  typeKeyList.size()>0">
-            AND sd.type_key in
-            <foreach collection="typeKeyList" item="typeKey" index="index" open="(" close=")" separator=",">
-                #{typeKey}
-            </foreach>
-        </if>
-        <if test="deptIdList!=null and  deptIdList.size()>0">
-            AND sd.id IN
-            <foreach collection="deptIdList" item="deptId" index="index" open="(" close=")" separator=",">
-                #{deptId}
-            </foreach>
-        </if>
-    </select>
-    <!--查询所有网格-->
-    <select id="selectListAllGridId" resultType="Long">
-        SELECT
-            sd.id
         FROM
             sys_dept sd
+            LEFT JOIN sys_dept p ON ( sd.pid = p.id )
         WHERE
-            sd.type_key = 'grid_party'
+            sd.del_flag = '0'
-    </select>
+            <if test="typeKeyList!=null and  typeKeyList.size()>0">
-
+                AND sd.type_key  in
-    <select id="pageDeptIdByTypeKey" resultType="java.lang.Long">
+                <foreach collection="typeKeyList" item="typeKey" index="index" open="(" close=")" separator=",">
-        SELECT d.id  FROM sys_dept d
+                    #{typeKey}
-        WHERE d.type_key = #{typeKey} AND d.del_flag = '0' AND d.id != 0
+                </foreach>
-        ORDER BY d.create_date ASC
+            </if>
-            LIMIT #{pageIndex},#{pageSize}
+            <if test="deptIdList!=null and  deptIdList.size()>0">
-    </select>
+                AND sd.id IN
-
+                <foreach collection="deptIdList" item="deptId" index="index" open="(" close=")" separator=",">
-
+                    #{deptId}
-    <select id="selectDeptLeaderName" resultType="java.lang.String">
+                </foreach>
-        SELECT
+            </if>
-            GROUP_CONCAT( u.real_name ) gridLeader
-        FROM
-            sys_dept d
-            LEFT JOIN sys_role_data_scope rds ON rds.dept_id = d.id
-            LEFT JOIN sys_role r ON rds.role_id = r.id
-            LEFT JOIN sys_role_user ru ON ru.role_id = r.id
-            LEFT JOIN sys_user u ON u.id = ru.user_id
-        WHERE
-            r.type_key = #{roleType} AND d.id = #{deptId} AND u.id != ''
-        GROUP BY d.id
     </select>
 
     <!--获取所有部门tree-->

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml

@@ -3,19 +3,4 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.SysRoleDao">
 
-    <select id="selectAmountByRoleTpye" resultType="java.util.Map">
-        SELECT
-            d.id, d.type_key typeKey, count( u.real_name) amount
-        FROM
-            sys_dept d
-            LEFT JOIN sys_role_data_scope rds ON rds.dept_id = d.id
-            LEFT JOIN sys_role r ON rds.role_id = r.id
-            LEFT JOIN sys_role_user ru ON ru.role_id = r.id
-            LEFT JOIN sys_user u ON u.id = ru.user_id
-        WHERE
-            r.type_key = #{roleType} AND u.id != ''
-            AND d.id in (<foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>)
-        GROUP BY
-            d.id
-    </select>
 </mapper>

esua-epdc/epdc-commons/epdc-common-clienttoken/pom.xml

@@ -23,12 +23,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-user-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java

@@ -1,11 +1,8 @@
 package com.elink.esua.epdc.common.token.dto;
 
-import com.elink.esua.epdc.dto.UserTagInfo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 用户token
@@ -49,12 +46,7 @@ public class TokenDto implements Serializable {
     private Long gridId;
 
     /**
-     * 性别(女性-0，男性-1)
+     * 党员标识 0：否、1：是
      */
-    private String sex;
+    private String partyFlag;
-
-    /**
-     * 用户标签信息列表
-     */
-    private List<UserTagInfo> userTagInfos;
 }

esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/CpUserDetailRedis.java

@@ -40,26 +40,6 @@ public class CpUserDetailRedis {
         redisUtils.hMSet(key, map, expire);
     }
 
-    /**
-     * 缓存用户信息，不同于{@link CpUserDetailRedis#set(TokenDto, long)}之处在于存放进redis时，拼接key的后缀可以自定义
-     *
-     * @param user           用户信息
-     * @param expire         超时时长
-     * @param redisKeySuffix redis的key的后缀
-     * @return void
-     * @author work@yujt.net.cn
-     * @date 2020/1/31 15:13
-     */
-    public void set(TokenDto user, long expire, String redisKeySuffix) {
-        if (user == null) {
-            return;
-        }
-        String key = RedisKeys.getCpUserKey(redisKeySuffix);
-        //bean to map
-        Map<String, Object> map = BeanUtil.beanToMap(user, false, true);
-        redisUtils.hMSet(key, map, expire);
-    }
-
     /**
      * 获取token信息
      *

esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/IdentityNoAnalysisUtil.java

@@ -1,178 +0,0 @@
-package com.elink.esua.epdc.common.token.util;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 用户工具类
- *
- * @author wanggongfeng
- * @Date 19-12-16
- */
-public class IdentityNoAnalysisUtil {
-    /**
-     * 15位身份证号
-     */
-    private static final Integer FIFTEEN_ID_CARD=15;
-    /**
-     * 18位身份证号
-     */
-    private static final Integer EIGHTEEN_ID_CARD=18;
-    private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-
-    /**
-     * 从身份证号码中获取生日
-     * @param idno
-     * @return null表示idno错误，未获取到生日
-     */
-    public static Date getBirthDay(String idno){
-        if(!isValid(idno)){
-            return null;
-        }
-        return toBirthDay(idno.substring(6, 14));
-    }
-
-    /**
-     * 根据身份证号获取性别
-     * @param IDCard
-     * @return
-     */
-    public static String getSex(String IDCard){
-        String sex ="";
-        if (StringUtils.isNotBlank(IDCard)){
-            //15位身份证号
-            if (IDCard.length() == FIFTEEN_ID_CARD){
-                if (Integer.parseInt(IDCard.substring(14, 15)) % 2 == 0) {
-                    sex = "女";
-                } else {
-                    sex = "男";
-                }
-                //18位身份证号
-            }else if(IDCard.length() == EIGHTEEN_ID_CARD){
-                // 判断性别
-                if (Integer.parseInt(IDCard.substring(16).substring(0, 1)) % 2 == 0) {
-                    sex = "女";
-                } else {
-                    sex = "男";
-                }
-            }
-        }
-        return sex;
-    }
-
-    /**
-     * 根据身份证号获取年龄
-     * @param IDCard
-     * @return
-     */
-    public static Integer getAge(String IDCard){
-        Integer age = 0;
-        Date date = new Date();
-        if (StringUtils.isNotBlank(IDCard)&& isValid(IDCard)){
-            //15位身份证号
-            if (IDCard.length() == FIFTEEN_ID_CARD){
-                // 身份证上的年份(15位身份证为1980年前的)
-                String uyear = "19" + IDCard.substring(6, 8);
-                // 身份证上的月份
-                String uyue = IDCard.substring(8, 10);
-                // 当前年份
-                String fyear = format.format(date).substring(0, 4);
-                // 当前月份
-                String fyue = format.format(date).substring(5, 7);
-                if (Integer.parseInt(uyue) <= Integer.parseInt(fyue)) {
-                    age = Integer.parseInt(fyear) - Integer.parseInt(uyear) + 1;
-                    // 当前用户还没过生
-                } else {
-                    age = Integer.parseInt(fyear) - Integer.parseInt(uyear);
-                }
-                //18位身份证号
-            }else if(IDCard.length() == EIGHTEEN_ID_CARD){
-                // 身份证上的年份
-                String year = IDCard.substring(6).substring(0, 4);
-                // 身份证上的月份
-                String yue = IDCard.substring(10).substring(0, 2);
-                // 当前年份
-                String fyear = format.format(date).substring(0, 4);
-                // 当前月份
-                String fyue = format.format(date).substring(5, 7);
-                // 当前月份大于用户出身的月份表示已过生日
-                if (Integer.parseInt(yue) <= Integer.parseInt(fyue)) {
-                    age = Integer.parseInt(fyear) - Integer.parseInt(year) + 1;
-                    // 当前用户还没过生日
-                } else {
-                    age = Integer.parseInt(fyear) - Integer.parseInt(year);
-                }
-            }
-        }
-        return age;
-    }
-
-    /**
-     * 身份证验证
-     * @param id 号码内容
-     * @return 是否有效
-     */
-    public static boolean isValid(String id){
-        Boolean validResult = true;
-        //校验长度只能为15或18
-        int len = id.length();
-        if (len != FIFTEEN_ID_CARD && len != EIGHTEEN_ID_CARD){
-            validResult = false;
-        }
-        //校验生日
-        if (!validDate(id)){
-            validResult = false;
-        }
-        return validResult;
-    }
-
-    /**
-     * 校验生日
-     * @param id
-     * @return
-     */
-    private static boolean validDate(String id)
-    {
-        try
-        {
-            String birth = id.length() == 15 ? "19" + id.substring(6, 12) : id.substring(6, 14);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            Date birthDate = sdf.parse(birth);
-            if (!birth.equals(sdf.format(birthDate))){
-                return false;
-            }
-        }
-        catch (ParseException e)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 转换成日期
-     * @param birthday
-     * @return
-     */
-    private static Date toBirthDay(String birthday){
-        try{
-            Calendar calendar = Calendar.getInstance();
-            calendar.set(Calendar.YEAR, Integer.parseInt(birthday.substring(0, 4)));
-            calendar.set(Calendar.MONTH, Integer.parseInt(birthday.substring(4, 6)) - 1);//月份从0开始，所以减1
-            calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(birthday.substring(6, 8)));
-            //以下设置意义不大
-            calendar.set(Calendar.HOUR_OF_DAY, 0);
-            calendar.set(Calendar.MINUTE, 0);
-            calendar.set(Calendar.SECOND, 0);
-            calendar.set(Calendar.MILLISECOND, 0);
-
-            return calendar.getTime();
-        }catch (Exception e){
-            return null;
-        }
-    }
-}

esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/DeptScope.java

@@ -1,36 +0,0 @@
-package com.elink.esua.epdc.commons.mybatis.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 部门冗余字段基类
- *
- * @author rongchao
- * @Date 19-12-18
- */
-@Data
-public abstract class DeptScope extends BaseEpdcEntity implements Serializable {
-
-    /***
-     *所有部门名称
-     */
-    private String allDeptNames;
-
-    /***
-     *所有部门ID
-     */
-    private String allDeptIds;
-
-    /***
-     *父所有部门
-     */
-    private String parentDeptNames;
-
-    /***
-     *父所有部门
-     */
-    private String parentDeptIds;
-
-}

esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java

@@ -1,74 +0,0 @@
-package com.elink.esua.epdc.commons.mybatis.utils;
-
-import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
-import lombok.Data;
-
-/**
- * 部门信息实体工具类
- *
- * @author rongchao
- * @Date 19-12-18
- */
-public class DeptEntityUtils {
-
-    @Data
-    public static class DeptDto {
-        /**
-         * 父所有部门ID
-         */
-        private String parentDeptIds;
-        /**
-         * 父所有部门
-         */
-        private String parentDeptNames;
-        /**
-         * 所有部门ID
-         */
-        private String allDeptIds;
-        /**
-         * 所有部门
-         */
-        private String allDeptNames;
-    }
-
-    /**
-     * 装载部门信息
-     *
-     * @param dto
-     * @param entityClass
-     * @return T
-     * @author rongchao
-     * @since 2019-12-18
-     */
-    public static <T extends DeptScope> T loadDeptInfo(DeptDto dto, Class<T> entityClass) {
-        try {
-            T t = entityClass.newInstance();
-            t.setAllDeptIds(dto.getAllDeptIds());
-            t.setAllDeptNames(dto.getAllDeptNames());
-            t.setParentDeptIds(dto.getParentDeptIds());
-            t.setParentDeptNames(dto.getParentDeptNames());
-            return t;
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 装载部门信息
-     *
-     * @param dto
-     * @param entity
-     * @return void
-     * @author rongchao
-     * @since 2019-12-18
-     */
-    public static <T extends DeptScope> void loadDeptInfo(DeptDto dto, T entity) {
-        entity.setAllDeptIds(dto.getAllDeptIds());
-        entity.setAllDeptNames(dto.getAllDeptNames());
-        entity.setParentDeptIds(dto.getParentDeptIds());
-        entity.setParentDeptNames(dto.getParentDeptNames());
-    }
-}

esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml

@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java

@@ -1,12 +0,0 @@
-package com.elink.esua.epdc.commons.tools.constant;
-
-/**
- * Nacos配置中心相关常量
- *
- * @author rongchao
- * @Date 20-1-15
- */
-public interface NacosConfigConstant {
-
-    String CONFIG_GROUP = "EPDC_CONFIG_GROUP";
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java

@@ -9,21 +9,17 @@ package com.elink.esua.epdc.commons.tools.constant;
  */
 public interface NumConstant {
 
-    int TWO_NEG = -2;
-    int ONE_NEG = -1;
     int ZERO = 0;
     int ONE = 1;
     int TWO = 2;
     int THREE = 3;
     int FOUR = 4;
     int SIX = 6;
-    int SEVEN = 7;
-    int EIGHT = 8;
-    int NINE = 9;
-    int TEN = 10;
-    int ELEVEN = 11;
-    int TWELVE = 12;
 
+    int ONE_NEG = -1;
+    int TWO_NEG = -2;
+
+    int TEN = 10;
     int FIFTEEN = 15;
     int TWENTY = 20;
     int THIRTY = 30;

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java

@@ -1,13 +0,0 @@
-package com.elink.esua.epdc.commons.tools.constant;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/16 19:38
- * @Description: 积分用
- */
-public interface PointsConstant {
-	/**
-	 * 手动调整积分编码
-	 */
-	String ruleCode ="hand_regulation";
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java

@@ -84,14 +84,4 @@ public interface ServiceConstant {
      * 定制功能模块
      */
     String EPDC_CUSTOM_SERVER = "epdc-custom-server";
-
-    /**
-     * 积分模块
-     */
-    String EPDC_POINTS_SERVER = "epdc-points-server";
-
-    /**
-     * 开放接口模块
-     */
-    String EPDC_API_SERVER = "epdc-api-server";
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/StrConstant.java

@@ -1,41 +0,0 @@
-package com.elink.esua.epdc.commons.tools.constant;
-
-import org.apache.commons.codec.CharEncoding;
-import org.springframework.http.MediaType;
-
-
-/**
- * 字符串常量
- *
- * @author work@yujt.net.cn
- * @date 2019/12/13 11:19
- */
-public interface StrConstant {
-
-    String UTF_8 = CharEncoding.UTF_8;
-
-    String ISO_8859_1 = CharEncoding.ISO_8859_1;
-
-    String JAVASCRIPT = "javascript";
-
-    String APPLICATION_JSON_UTF8_VALUE = MediaType.APPLICATION_JSON_UTF8_VALUE;
-
-    String EXCEL_SUFFIX_2003 = ".xls";
-
-    String EXCEL_SUFFIX_2007 = ".xlsx";
-
-    /**
-     * 连字符号、短杠
-     */
-    String HYPHEN = "-";
-
-    /**
-     * 英文逗号
-     */
-    String COMMA = ",";
-
-    /**
-     * 冒号
-     */
-    String COLON = ":";
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserAuthTypeEnum.java

@@ -1,35 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums;
-
-/**
- * 用户认证类别枚举类
- *
- * @author rongchao
- * @Date 19-12-19
- */
-public enum UserAuthTypeEnum {
-
-    /**
-     * 居民认证
-     */
-    RESIDENT_AUTH("0"),
-
-    /**
-     * 党员认证
-     */
-    PARTY_AUTH("1"),
-
-    /**
-     * 志愿者认证
-     */
-    VOLUNTEER_AUTH("2");
-
-    private String value;
-
-    UserAuthTypeEnum(String value) {
-        this.value = value;
-    }
-
-    public String value() {
-        return this.value;
-    }
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java

@@ -1,28 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/17 19:11
- * @Description: 用户身份枚举类
- */
-public enum UserTagEnum {
-    /**
-     * 党员
-     */
-    PARTY_MEMBER("partymember"),
-
-    /**
-     * 志愿者
-     */
-    VOLUNTEER("volunteer");
-
-    private String value;
-
-    UserTagEnum(String value) {
-        this.value = value;
-    }
-
-    public String value() {
-        return this.value;
-    }
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java

@@ -1,40 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2020/2/6 14:01
- * @Description: 积分行为编码
- */
-public enum PointsBehaviorCodeEnum {
-	LIKE("like", "赞"),
-	DISLIKE("dislike", "踩"),
-	SHARE("share", "分享"),
-	CLOCK("clock", "打卡"),
-	COMMENT("comment", "评论"),
-	BREAK_PROMISE("break_promise", "爽约"),
-	JOIN_ACT("join_act", "活动积分");
-
-	private String behaviorCode;
-	private String name;
-
-	PointsBehaviorCodeEnum(String behaviorCode, String name) {
-		this.behaviorCode = behaviorCode;
-		this.name = name;
-	}
-
-	public String getBehaviorCode() {
-		return behaviorCode;
-	}
-
-	public void setBehaviorCode(String behaviorCode) {
-		this.behaviorCode = behaviorCode;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsLimitTimeEnum.java

@@ -1,27 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/13 09:43
- * @Description: 积分规则限制时限枚举类
- */
-public enum PointsLimitTimeEnum {
-	/**
-	 * 限制时限(0-分钟，1-小时，2-日，3-月，4-年)
-	 */
-	LIMIT_TIME_MINUTE("0"),
-	LIMIT_TIME_HOUR("1"),
-	LIMIT_TIME_DAY("2"),
-	LIMIT_TIME_MONTH("3"),
-	LIMIT_TIME_YEAR("4");
-
-	private String value;
-
-	PointsLimitTimeEnum(String value) {
-		this.value = value;
-	}
-
-	public String value() {
-		return value;
-	}
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationEnum.java

@@ -1,24 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/13 09:31
- * @Description: 积分操作类型枚举类
- */
-public enum PointsOperationEnum {
-	/**
-	 * 规则操作类型(0-减积分，1-加积分)
-	 */
-	OPERATION_TYPE_ADD("1"),
-	OPERATION_TYPE_SUBSTRACT("0");
-
-	private String operationType;
-
-	PointsOperationEnum(String operationType) {
-		this.operationType = operationType;
-	}
-
-	public String getOperationType() {
-		return operationType;
-	}
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationModeEnum.java

@@ -1,34 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/13 09:33
- * @Description: 积分操作方式枚举类
- */
-public enum PointsOperationModeEnum {
-
-	/**
-	 * user-用户操作
-	 */
-	OPERATION_MODE_USER("user"),
-
-	/**
-	 * admin-管理员操作
-	 */
-	OPERATION_MODE_ADMIN("admin"),
-
-	/**
-	 * sys-系统操作
-	 */
-	OPERATION_MODE_SYS("sys");
-
-	private String operationMode;
-
-	PointsOperationModeEnum(String operationMode) {
-		this.operationMode = operationMode;
-	}
-
-	public String getOperationMode() {
-		return operationMode;
-	}
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleAvailableEnum.java

@@ -1,26 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/12 15:04
- * @Description: 积分规则可用标志枚举类
- */
-public enum PointsRuleAvailableEnum {
-
-
-	/**
-	 * 可用标记(0-不可用，1-可用)
-	 */
-	AVAILABLE_TRUE("1"),
-	AVAILABLE_FALSE("0");
-
-	private String value;
-
-	PointsRuleAvailableEnum(String value) {
-		this.value = value;
-	}
-
-	public String value() {
-		return value;
-	}
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java

@@ -1,36 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2020/2/6 14:00
- * @Description: 积分规则编码
- */
-public enum PointsRuleCodeEnum {
-	CANCEL_ACT("cancel_act", "取消报名系统扣减积分"),
-	CONFIRM_JOIN_ACT("confirm_join_act", "参与活动确认积分");
-
-	private String ruleCode;
-	private String name;
-
-	PointsRuleCodeEnum(String ruleCode, String name) {
-		this.ruleCode = ruleCode;
-		this.name = name;
-	}
-
-	public String getRuleCode() {
-		return ruleCode;
-	}
-
-	public void setRuleCode(String ruleCode) {
-		this.ruleCode = ruleCode;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-}
-

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsUpperLimitEnum.java

@@ -1,28 +0,0 @@
-package com.elink.esua.epdc.commons.tools.enums.pointsenum;
-
-/**
- * @Auther: yinzuomei
- * @Date: 2019/12/13 09:48
- * @Description: 积分是否有上限限制 枚举类
- */
-public enum PointsUpperLimitEnum {
-	/**
-	 * 是
-	 */
-	YES("1"),
-
-	/**
-	 * 否
-	 */
-	NO("0");
-
-	private String value;
-
-	PointsUpperLimitEnum(String value) {
-		this.value = value;
-	}
-
-	public String value() {
-		return value;
-	}
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java

@@ -128,7 +128,7 @@ public class RedisKeys {
     }
 
     /**
-     * 管理员有数据权限的部门层级关系
+     * 管理员部门层级关系
      *
      * @param userId 用户id
      * @return java.lang.String
@@ -151,18 +151,6 @@ public class RedisKeys {
         return rootPrefix.concat("options:dept:user:all:").concat(String.valueOf(userId));
     }
 
-    /**
-     * 存放部门层级关系，主要用于获取拼接后的部门id和部门名称
-     *
-     * @param deptId
-     * @return java.lang.String
-     * @author work@yujt.net.cn
-     * @date 2019/12/20 20:34
-     */
-    public static String getDeptOptionKey(Long deptId) {
-        return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId));
-    }
-
     /**
      * 事件分类
      */
@@ -191,46 +179,4 @@ public class RedisKeys {
     public static String getAllDeptOptionKeyForEpiDemic() {
         return rootPrefix.concat("options:dept:epidemic:all:");
     }
-
-    /**
-     * @Author wanggongfeng
-     * @Description常用语
-     */
-    public static String getPhraseListKey() {
-        return rootPrefix.concat("heart:phrase:list");
-    }
-
-    /**
-     * @param ruleCode 积分规则编码
-     * @return java.lang.String
-     * @Author yinzuomei
-     * @Description 积分规则
-     * @Date 2019/12/12 10:02
-     **/
-    public static String getPointsRuleKey(String ruleCode) {
-        return rootPrefix.concat("config:points:rule:").concat(ruleCode);
-    }
-
-    /**
-     * 按项目分类设置项目响应/关闭时限
-     *
-     * @param categoryId
-     * @return java.lang.String
-     * @author work@yujt.net.cn
-     * @date 2019/12/20 20:38
-     */
-    public static String getKpiItemTimeLimitKey(String categoryId) {
-        return rootPrefix.concat("config:kpi:itemtimelimit:").concat(categoryId);
-    }
-
-    /**
-     * 存储议题响应/关闭时限
-     *
-     * @return java.lang.String
-     * @author work@yujt.net.cn
-     * @date 2019/12/20 20:39
-     */
-    public static String getKpiIssueTimeLimitKey() {
-        return rootPrefix.concat("config:kpi:itemtimelimit");
-    }
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java

@@ -25,16 +25,11 @@ import java.util.Date;
  * @since 1.0.0
  */
 public class DateUtils {
-
 	/** 时间格式(yyyy-MM-dd) */
 	public final static String DATE_PATTERN = "yyyy-MM-dd";
-
 	/** 时间格式(yyyy-MM-dd HH:mm:ss) */
 	public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
-    /** 时间格式(yyyyMMddHHmmss) */
-	public final static String DATE_TIME_NO_SPLIT  = "yyyyMMddHHmmss";
-
     /**
      * 日期格式化 日期格式为：yyyy-MM-dd
      * @param date  日期

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java

@@ -11,12 +11,9 @@ package com.elink.esua.epdc.commons.tools.utils;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -83,66 +80,4 @@ public class ExcelUtils {
 
         exportExcel(response, fileName, targetList, targetClass);
     }
-
-    /**
-     * 获取单元格内容
-     * @param cell
-     * @return
-     */
-    public static String getCellContent(Cell cell){
-        String value = "";
-        if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
-            value = String.valueOf(cell.getNumericCellValue());
-        } else {
-            value = cell.getStringCellValue();
-        }
-        //内容超过25个字进行长度限制，否则数据库会超限
-		/*if(value.length() > 25){
-			value = value.substring(0,25) + "...";
-		}*/
-        return value;
-    }
-
-    /**
-     * 获取excle版本
-     * @param mFile
-     * @return
-     */
-    public static String getExcelInfo(MultipartFile mFile) {
-        String fileName = mFile.getOriginalFilename();// 获取文件名
-        String isExcel2003 = "true";// 根据文件名判断文件是2003版本还是2007版本
-        try {
-            if (!validateExcel(fileName)) {// 验证文件名是否合格
-                return "";
-            }
-            if (isExcel2007(fileName)) {
-                isExcel2003 = "false";
-            }
-            return isExcel2003;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
-    /**
-     * 验证EXCEL文件
-     * @param filePath
-     * @return
-     */
-    public static boolean validateExcel(String filePath) {
-        if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))) {
-            return false;
-        }
-        return true;
-    }
-
-    // @描述：是否是2003的excel，返回true是2003
-    public static boolean isExcel2003(String filePath) {
-        return filePath.matches("^.+\\.(?i)(xls)$");
-    }
-    // @描述：是否是2007的excel，返回true是2007
-    public static boolean isExcel2007(String filePath) {
-        return filePath.matches("^.+\\.(?i)(xlsx)$");
-    }
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/GPSUtils.java

@@ -1,155 +1,146 @@
 package com.elink.esua.epdc.commons.tools.utils;
 
 /**
- * @Description
+ * @Description TODO
  * @Author yinzuomei
  * @Date 2019/12/27 10:00
  */
 public class GPSUtils {
-    public static double pi = 3.1415926535897932384626;
+	public static double pi = 3.1415926535897932384626;
-    public static double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	public static double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
-    public static double a = 6378245.0;
+	public static double a = 6378245.0;
-    public static double ee = 0.00669342162296594323;
+	public static double ee = 0.00669342162296594323;
 
-    public static double transformLat(double x, double y) {
+	public static double transformLat(double x, double y) {
-        double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y
+		double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y
-                + 0.2 * Math.sqrt(Math.abs(x));
+			+ 0.2 * Math.sqrt(Math.abs(x));
-        ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
-        ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
-        ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
+		ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
-        return ret;
+		return ret;
-    }
+	}
 
-    public static double transformLon(double x, double y) {
+	public static double transformLon(double x, double y) {
-        double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1
+		double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1
-                * Math.sqrt(Math.abs(x));
+			* Math.sqrt(Math.abs(x));
-        ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
-        ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
-        ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0
+		ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0
-                * pi)) * 2.0 / 3.0;
+			* pi)) * 2.0 / 3.0;
-        return ret;
+		return ret;
-    }
+	}
+	public static double[] transform(double lat, double lon) {
+		if (outOfChina(lat, lon)) {
+			return new double[]{lat,lon};
+		}
+		double dLat = transformLat(lon - 105.0, lat - 35.0);
+		double dLon = transformLon(lon - 105.0, lat - 35.0);
+		double radLat = lat / 180.0 * pi;
+		double magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		double sqrtMagic = Math.sqrt(magic);
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		double mgLat = lat + dLat;
+		double mgLon = lon + dLon;
+		return new double[]{mgLat,mgLon};
+	}
+	public static boolean outOfChina(double lat, double lon) {
+		if (lon < 72.004 || lon > 137.8347)
+			return true;
+		if (lat < 0.8293 || lat > 55.8271)
+			return true;
+		return false;
+	}
+	/**
+	 * 84 to 火星坐标系 (GCJ-02) World Geodetic System ==> Mars Geodetic System
+	 *
+	 * @param lat
+	 * @param lon
+	 * @return
+	 */
+	public static double[] gps84_To_Gcj02(double lat, double lon) {
+		if (outOfChina(lat, lon)) {
+			return new double[]{lat,lon};
+		}
+		double dLat = transformLat(lon - 105.0, lat - 35.0);
+		double dLon = transformLon(lon - 105.0, lat - 35.0);
+		double radLat = lat / 180.0 * pi;
+		double magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		double sqrtMagic = Math.sqrt(magic);
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		double mgLat = lat + dLat;
+		double mgLon = lon + dLon;
+		return new double[]{mgLat, mgLon};
+	}
 
-    public static double[] transform(double lat, double lon) {
+	/**
-        if (outOfChina(lat, lon)) {
+	 * * 火星坐标系 (GCJ-02) to 84 * * @param lon * @param lat * @return
-            return new double[]{lat, lon};
+	 * */
-        }
+	public static double[] gcj02_To_Gps84(double lat, double lon) {
-        double dLat = transformLat(lon - 105.0, lat - 35.0);
+		double[] gps = transform(lat, lon);
-        double dLon = transformLon(lon - 105.0, lat - 35.0);
+		double lontitude = lon * 2 - gps[1];
-        double radLat = lat / 180.0 * pi;
+		double latitude = lat * 2 - gps[0];
-        double magic = Math.sin(radLat);
+		return new double[]{latitude, lontitude};
-        magic = 1 - ee * magic * magic;
+	}
-        double sqrtMagic = Math.sqrt(magic);
+	/**
-        dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+	 * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标
-        dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+	 *
-        double mgLat = lat + dLat;
+	 * @param lat
-        double mgLon = lon + dLon;
+	 * @param lon
-        return new double[]{mgLat, mgLon};
+	 */
-    }
+	public static double[] gcj02_To_Bd09(double lat, double lon) {
+		double x = lon, y = lat;
+		double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+		double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+		double tempLon = z * Math.cos(theta) + 0.0065;
+		double tempLat = z * Math.sin(theta) + 0.006;
+		double[] gps = {tempLat,tempLon};
+		return gps;
+	}
 
-    public static boolean outOfChina(double lat, double lon) {
+	/**
-        if (lon < 72.004 || lon > 137.8347)
+	 * * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 * * 将 BD-09 坐标转换成GCJ-02 坐标 * * @param
-            return true;
+	 * bd_lat * @param bd_lon * @return
-        if (lat < 0.8293 || lat > 55.8271)
+	 */
-            return true;
+	public static double[] bd09_To_Gcj02(double lat, double lon) {
-        return false;
+		double x = lon - 0.0065, y = lat - 0.006;
-    }
+		double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+		double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+		double tempLon = z * Math.cos(theta);
+		double tempLat = z * Math.sin(theta);
+		double[] gps = {tempLat,tempLon};
+		return gps;
+	}
 
-    /**
+	/**将gps84转为bd09
-     * 84 to 火星坐标系 (GCJ-02) World Geodetic System ==> Mars Geodetic System
+	 * @param lat
-     *
+	 * @param lon
-     * @param lat
+	 * @return
-     * @param lon
+	 */
-     * @return
+	public static double[] gps84_To_bd09(double lat,double lon){
-     */
+		double[] gcj02 = gps84_To_Gcj02(lat,lon);
-    public static double[] gps84_To_Gcj02(double lat, double lon) {
+		double[] bd09 = gcj02_To_Bd09(gcj02[0],gcj02[1]);
-        if (outOfChina(lat, lon)) {
+		return bd09;
-            return new double[]{lat, lon};
+	}
-        }
+	public static double[] bd09_To_gps84(double lat,double lon){
-        double dLat = transformLat(lon - 105.0, lat - 35.0);
+		double[] gcj02 = bd09_To_Gcj02(lat, lon);
-        double dLon = transformLon(lon - 105.0, lat - 35.0);
+		double[] gps84 = gcj02_To_Gps84(gcj02[0], gcj02[1]);
-        double radLat = lat / 180.0 * pi;
+		//保留小数点后六位
-        double magic = Math.sin(radLat);
+		gps84[0] = retain6(gps84[0]);
-        magic = 1 - ee * magic * magic;
+		gps84[1] = retain6(gps84[1]);
-        double sqrtMagic = Math.sqrt(magic);
+		return gps84;
-        dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+	}
-        dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
-        double mgLat = lat + dLat;
-        double mgLon = lon + dLon;
-        return new double[]{mgLat, mgLon};
-    }
 
-    /**
+	/**保留小数点后六位
-     * * 火星坐标系 (GCJ-02) to 84 * * @param lon * @param lat * @return
+	 * @param num
-     */
+	 * @return
-    public static double[] gcj02_To_Gps84(double lat, double lon) {
+	 */
-        double[] gps = transform(lat, lon);
+	private static double retain6(double num){
-        double lontitude = lon * 2 - gps[1];
+		String result = String .format("%.6f", num);
-        double latitude = lat * 2 - gps[0];
+		return Double.valueOf(result);
-        return new double[]{latitude, lontitude};
+	}
-    }
-
-    /**
-     * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标
-     *
-     * @param lat
-     * @param lon
-     */
-    public static double[] gcj02_To_Bd09(double lat, double lon) {
-        double x = lon, y = lat;
-        double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
-        double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
-        double tempLon = z * Math.cos(theta) + 0.0065;
-        double tempLat = z * Math.sin(theta) + 0.006;
-        double[] gps = {tempLat, tempLon};
-        return gps;
-    }
-
-    /**
-     * * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 * * 将 BD-09 坐标转换成GCJ-02 坐标 * * @param
-     * bd_lat * @param bd_lon * @return
-     */
-    public static double[] bd09_To_Gcj02(double lat, double lon) {
-        double x = lon - 0.0065, y = lat - 0.006;
-        double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
-        double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
-        double tempLon = z * Math.cos(theta);
-        double tempLat = z * Math.sin(theta);
-        double[] gps = {tempLat, tempLon};
-        return gps;
-    }
-
-    /**
-     * 将gps84转为bd09
-     *
-     * @param lat
-     * @param lon
-     * @return
-     */
-    public static double[] gps84_To_bd09(double lat, double lon) {
-        double[] gcj02 = gps84_To_Gcj02(lat, lon);
-        double[] bd09 = gcj02_To_Bd09(gcj02[0], gcj02[1]);
-        return bd09;
-    }
-
-    public static double[] bd09_To_gps84(double lat, double lon) {
-        double[] gcj02 = bd09_To_Gcj02(lat, lon);
-        double[] gps84 = gcj02_To_Gps84(gcj02[0], gcj02[1]);
-        //保留小数点后六位
-        gps84[0] = retain6(gps84[0]);
-        gps84[1] = retain6(gps84[1]);
-        return gps84;
-    }
-
-    /**
-     * 保留小数点后六位
-     *
-     * @param num
-     * @return
-     */
-    private static double retain6(double num) {
-        String result = String.format("%.6f", num);
-        return Double.valueOf(result);
-    }
 }
 

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java

@@ -1,51 +0,0 @@
-package com.elink.esua.epdc.commons.tools.utils;
-
-
-import java.time.*;
-import java.util.Date;
-
-/**
- * @author work@yujt.net.cn
- * @date 2019/12/13 15:05
- */
-public class LocalDateUtils {
-
-
-    public static LocalDateTime dateToLocalDateTime(Date date) {
-        Instant instant = date.toInstant();
-        ZoneId zone = ZoneId.systemDefault();
-        return LocalDateTime.ofInstant(instant, zone);
-    }
-
-    public static LocalDate dateToLocalDate(Date date) {
-        Instant instant = date.toInstant();
-        ZoneId zone = ZoneId.systemDefault();
-        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
-        return localDateTime.toLocalDate();
-    }
-
-    public static YearMonth dateToYearMonth(Date date) {
-        LocalDate localDate = dateToLocalDate(date);
-        return YearMonth.of(localDate.getYear(), localDate.getMonthValue());
-    }
-
-    public static LocalTime dateToLocalTime(Date date) {
-        Instant instant = date.toInstant();
-        ZoneId zone = ZoneId.systemDefault();
-        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
-        return localDateTime.toLocalTime();
-    }
-
-    public static Date localDateTimeToDate(LocalDateTime localDateTime) {
-        ZoneId zone = ZoneId.systemDefault();
-        Instant instant = localDateTime.atZone(zone).toInstant();
-        return Date.from(instant);
-    }
-
-    public static Date localDateToDate(LocalDate localDate) {
-        ZoneId zone = ZoneId.systemDefault();
-        Instant instant = localDate.atStartOfDay().atZone(zone).toInstant();
-        return Date.from(instant);
-    }
-
-}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java

@@ -1,16 +1,8 @@
 package com.elink.esua.epdc.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.elink.esua.epdc.commons.tools.constant.StrConstant;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.CharEncoding;
-import org.springframework.util.Base64Utils;
-import org.springframework.util.StringUtils;
 
-import java.io.UnsupportedEncodingException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.UUID;
 
 /**
@@ -48,66 +40,7 @@ public class ModuleUtils {
      * @date 2019/9/5 14:44
      */
     public static String generateUUID() {
-        return UUID.randomUUID().toString().replace(StrConstant.HYPHEN, "");
+        return UUID.randomUUID().toString().replace("-", "");
     }
 
-    /**
-     * 字符串转换为base64
-     *
-     * @param params
-     * @return java.lang.String
-     * @author work@yujt.net.cn
-     * @date 2020/2/6 16:39
-     */
-    public static String encodeByBase64(String params) {
-        if (StringUtils.isEmpty(params)) {
-            return null;
-        }
-        try {
-            return Base64Utils.encodeToUrlSafeString(params.getBytes(CharEncoding.UTF_8));
-        } catch (UnsupportedEncodingException e) {
-            throw new RenException("字符串编码方法异常");
-        }
-    }
-
-    /**
-     * base64解码
-     *
-     * @param base64Str
-     * @return java.lang.String
-     * @author work@yujt.net.cn
-     * @date 2020/2/6 16:48
-     */
-    public static String decodeFromBase64(String base64Str) {
-        if (StringUtils.isEmpty(base64Str)) {
-            return null;
-        }
-        try {
-            return new String(Base64Utils.decodeFromUrlSafeString(base64Str), CharEncoding.UTF_8);
-        } catch (UnsupportedEncodingException e) {
-            throw new RenException("字符串编码方法异常");
-        }
-    }
-
-    /**
-     * 验证字符串是否是日期格式
-     *
-     * @param str        被验证的字符串
-     * @param dateFormat 指定日期格式
-     * @return boolean
-     * @author work@yujt.net.cn
-     * @date 2020/2/7 10:53
-     */
-    public static boolean isValidDate(String str, String dateFormat) {
-        boolean convertSuccess = true;
-        // 指定日期格式
-        SimpleDateFormat format = new SimpleDateFormat(dateFormat);
-        try {
-            format.setLenient(false);
-            format.parse(str);
-        } catch (ParseException e) {
-            convertSuccess = false;
-        }
-        return convertSuccess;
-    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.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.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * 取消报名参数
- *
- * @author wanggongfeng
- * @since v1.0.0 2019-12-17
- */
-@Data
-public class EpdcAppActUserCancelsignupDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-    /**
-     * 活动ID
-     */
-    @NotBlank(message = "活动ID不能为空")
-    private String actId;
-
-    /**
-     * 取消报名原因
-     */
-    @NotBlank(message = "取消报名原因不能为空")
-    private String failureReason;
-}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java

@@ -1,80 +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.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-
-/**
- * 用户打卡参数
- *
- * @author wanggongfeng
- * @since v1.0.0 2019-12-17
- */
-@Data
-public class EpdcAppActUserClockLogDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-    /**
-     * 活动ID
-     */
-    @NotBlank(message = "活动ID不能为空")
-    private String actId;
-    /**
-     * 打卡描述
-     */
-    @NotBlank(message = "打卡描述不能为空")
-    private String clockDesc;
-    /**
-     * 打卡位置经度
-     */
-    private BigDecimal clockLongitude;
-    /**
-     * 打卡位置纬度
-     */
-    private BigDecimal clockLatitude;
-    /**
-     * 打卡地址
-     */
-    @NotBlank(message = "打卡地址不能为空")
-    private String clockAddress;
-    /**
-     * 打卡图片
-     */
-    private ArrayList<String> images;
-    /**
-     * 打卡类型（0-打卡，1-更新打卡）
-     */
-    @NotBlank(message = "打卡类型不能为空")
-    private String clockType;
-    /**
-     * 打卡是否有效（0-否，1-是）
-     */
-    @NotBlank(message = "打卡是否有效不能为空")
-    private String effectiveFlag;
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java

@@ -23,7 +23,6 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
      * 身份证号码
      */
     private String identityNo;
-
     /**
      * 手机号
      */

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppClockListDTO.java

@@ -1,48 +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.elink.esua.epdc.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 打卡列表
- *
- * @author wanggongfeng
- * @since v1.0.0 2019-12-18
- */
-@Data
-public class EpdcAppClockListDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 活动打卡人次
-     */
-	private int clockNum;
-
-    /**
-     * 打卡列表
-     */
-	private List<Object> clocks;
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java

@@ -1,68 +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.elink.esua.epdc.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * 志愿者排名
- *
- * @author qu qu@elink-cn.com
- * @since v1.0.0 2019-12-18
- */
-@Data
-public class EpdcAppVolunteerRankDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 排名
-     */
-	private Integer sort;
-
-    /**
-     * 头像
-     */
-	private String faceImg;
-
-    /**
-     * 用户名
-     */
-	private String nickname;
-
-    /**
-     * 是否党员(0-否，1-是)
-     */
-	private String partyFlag;
-
-    /**
-     * 爱心时长(单位：小时)
-     */
-	private BigDecimal kindnessTime;
-
-    /**
-     * 参加次数
-     */
-	private Integer participationNum;
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -13,6 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
+        <!--        <weixin-java-mp.version>3.5.0</weixin-java-mp.version>-->
     </properties>
 
     <dependencies>
@@ -21,42 +22,35 @@
             <artifactId>epdc-api-client</artifactId>
             <version>1.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-tools</artifactId>
             <version>1.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-mybatis</artifactId>
             <version>1.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
-
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring.boot.admin.version}</version>
         </dependency>
-
         <!-- nacos start -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <!-- nacos end -->
-
         <!--版本控制-->
         <dependency>
             <groupId>com.esua.epdc</groupId>
@@ -92,10 +86,6 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java

@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
 package com.elink.esua.epdc;
 
 import org.springframework.boot.SpringApplication;
@@ -8,8 +16,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 /**
  * API模块
  *
- * @author rongchao
+ * @author Mark sunlightcs@gmail.com
- * @Date 20-1-15
+ * @since 1.0.0
  */
 @SpringBootApplication
 @EnableDiscoveryClient

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java

@@ -1,47 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.service.ActPhraseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * APP常用语相关接口
- *
- * @author wanggongfeng
- * @date 2019/12/17 10:30
- */
-@RestController
-@RequestMapping("heart/phrase")
-public class ApiActPhraseController {
-
-    @Autowired
-    private ActPhraseService actPhraseService;
-
-    /**
-     * 使用次数加一
-     * @param id
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @PostMapping("sagenumAddOne")
-    public Result sagenumAddOneById(String id) {
-        return actPhraseService.sagenumAddOneById(id);
-    }
-
-    /**
-     * 获取常用语列表
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @GetMapping("getPhraseList")
-    public Result getPhraseList() {
-        return actPhraseService.getPhraseList();
-
-    }
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@@ -1,164 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.activity.ActUserRelationDTO;
-import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
-import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
-import com.elink.esua.epdc.activity.AppClockListDTO;
-import com.elink.esua.epdc.activity.result.AppActInfoDTO;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.common.token.util.IdentityNoAnalysisUtil;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
-import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
-import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
-import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO;
-import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO;
-import com.elink.esua.epdc.service.ActUserRelationService;
-import com.elink.esua.epdc.service.AppUserService;
-import com.elink.esua.epdc.utils.UserTagUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-/**
- * APP活动相关接口
- *
- * @author wanggongfeng
- * @date 2019/12/17 10:30
- */
-@RestController
-@RequestMapping("heart/act")
-public class ApiActUserRelationController {
-
-    @Autowired
-    private ActUserRelationService actUserRelationService;
-
-    @Autowired
-    private AppUserService appUserService;
-
-    /**
-     * 活动报名
-     *
-     * @param tokenDto
-     * @param actId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @PostMapping("signup")
-    public Result activitySignUp(@LoginUser TokenDto tokenDto,String actId) {
-        if (StringUtils.isBlank(actId)) {
-            return new Result().error("活动id不能为空");
-        }
-        //验证是否为志愿者
-        Result isVolunteer = appUserService.getVolunteerCountById(tokenDto);
-        int code = isVolunteer.getCode();
-        if (code != 0) {
-            //不是志愿者
-            return isVolunteer;
-        }
-        Result<EpdcUserInfoResultDTO> userInfo = appUserService.getInfoById(tokenDto);
-        EpdcUserInfoResultDTO epdcUserInfoResultDTO = userInfo.getData();
-        String identityNo = epdcUserInfoResultDTO.getIdentityNo();
-        ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO();
-        actUserRelationDTO.setActId(actId);
-        actUserRelationDTO.setUserId(tokenDto.getUserId());
-        actUserRelationDTO.setNickname(tokenDto.getNickname());
-        actUserRelationDTO.setFaceImg(tokenDto.getFaceImg());
-        if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
-            actUserRelationDTO.setPartyFlag(YesOrNoEnum.YES.value());
-        } else {
-            actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value());
-        }
-        actUserRelationDTO.setRealName(tokenDto.getRealName());
-        String sex = IdentityNoAnalysisUtil.getSex(identityNo); // 身份证解析性别
-        if ("女".equals(sex)){
-            sex = "0";
-        }else {
-            sex = "1";
-        }
-        actUserRelationDTO.setSex(sex);
-        actUserRelationDTO.setAge(IdentityNoAnalysisUtil.getAge(identityNo));
-        actUserRelationDTO.setMobile(tokenDto.getMobile());
-        actUserRelationDTO.setIdentityNo(identityNo);
-        actUserRelationDTO.setStatus("0");
-        actUserRelationDTO.setSignupTime(new Date());
-        return actUserRelationService.activitySignUp(actUserRelationDTO);
-
-    }
-
-    /**
-     * 取消活动报名
-     *
-     * @param tokenDto
-     * @param epdcAppActUserCancelsignupDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @PostMapping("cancelsignup")
-    public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
-        ValidatorUtils.validateEntity(epdcAppActUserCancelsignupDTO);
-        epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId());
-        AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class);
-        return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO);
-
-    }
-
-    /**
-     * 活动打卡
-     *
-     * @param tokenDto
-     * @param epdcAppActUserClockLogDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @PostMapping("clock")
-    public Result activityClock(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO) {
-        ValidatorUtils.validateEntity(epdcAppActUserClockLogDTO);
-        AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class);
-        appActUserClockLogDTO.setUserId(tokenDto.getUserId());
-        return actUserRelationService.activityClock(appActUserClockLogDTO);
-
-    }
-
-    /**
-     * 获取打卡列表
-     *
-     * @param tokenDto
-     * @param actId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @GetMapping("clockList")
-    public Result<EpdcAppClockListDTO> getClockList(@LoginUser TokenDto tokenDto, String actId) {
-        Result<AppClockListDTO> result = actUserRelationService.getClockList(actId);
-        EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class);
-        Result<EpdcAppClockListDTO> result1 = new Result<EpdcAppClockListDTO>();
-        result1.setData(epdcAppClockListDTO);
-        return result1;
-
-    }
-
-    /**
-     * 获取活动打卡地点详情
-     *
-     * @param actId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @GetMapping("clockAddressDetail")
-    public Result<AppActInfoDTO> clockAddressDetail(String actId) {
-        return actUserRelationService.clockAddressDetail(actId);
-
-    }
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java

@@ -1,106 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.service.ActInfoService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 移动端接口-项目模块
- * @Author LPF
- * @Date 2019/11/18 13:32
- */
-@RestController
-@RequestMapping("heart/act")
-public class ApiAppActInfoController {
-
-    @Autowired
-    private ActInfoService actInfoService;
-
-
-    /**
-     * 活动列表
-     * @Params: [ formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("list")
-    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) {
-        formDto.setUserId(tokenDto.getUserId());
-        return actInfoService.listItems(formDto);
-    }
-    /**
-     * 活动列表
-     * @Params: [ formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("signupList")
-    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) {
-        formDto.setUserId(tokenDto.getUserId());
-        return actInfoService.signupListItems(formDto);
-    }
-
-    /**
-     * 项目详情
-     * @Params: [id]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("detail/{id}")
-    public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
-        if (StringUtils.isBlank(id)) {
-            return new Result<ActInfoDetailAppResultDTO>().error("id不能为空");
-        }
-        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
-        formDto.setId(id);
-        formDto.setUserId(tokenDto.getUserId());
-        return actInfoService.getDetail(formDto);
-    }
-
-    /**
-     * 项目详情
-     * @Params: [id]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("rejectDetail/{id}")
-    public Result<ActInfoDetailAppResultDTO> rejectDetail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
-        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
-        formDto.setId(id);
-        formDto.setUserId(tokenDto.getUserId());
-        return actInfoService.getRejectDetail(formDto);
-    }
-
-    /**
-     * 项目详情
-     * @Params: [id]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("cancelDetail/{id}")
-    public Result<ActInfoDetailAppResultDTO> cancelDetail(@PathVariable String id) {
-        return actInfoService.getCancelDetail(id);
-    }
-    @GetMapping("banner/list")
-    public Result<List<ActBannerDTO>> bannerList() {
-        return actInfoService.getBannerList();
-    }
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -9,8 +9,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@ import java.util.List;
  * 用户模块
  *
  * @author yujintao
- * @email yujintao@elink-cn.comuser/completeInfo
+ * @email yujintao@elink-cn.com
  * @date 2019/9/6 19:30
  */
 @RestController
@@ -106,7 +106,6 @@ public class ApiAppUserController {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.checkRegister(formDto);
     }
-
     /**
      * 用户生成小程序码
      *
@@ -128,7 +127,6 @@ public class ApiAppUserController {
      * @author yujintao
      * @date 2019/9/9 10:52
      */
-    @Deprecated
     @GetMapping("user/mp/getToken")
     public Result<EpdcAppAuthorizationDTO> getToken(EpdcAppUserTokenFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
@@ -243,7 +241,6 @@ public class ApiAppUserController {
     public Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(@LoginUser TokenDto tokenDto) {
         return appUserService.prepareCompleteUserInfo(tokenDto);
     }
-
     /**
      * 获取邀请记录
      *
@@ -267,22 +264,4 @@ public class ApiAppUserController {
     public Result checkWxUnionId(@LoginUser TokenDto tokenDto) {
         return appUserService.checkWxUnionId(tokenDto);
     }
-
-    /**
-     * 志愿者认证
-     *
-     * @param tokenDto
-     * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @PostMapping("volunteer/authenticate")
-    public Result volunteerAuthenticate(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteVolunteerInfoFormDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return appUserService.volunteerAuthenticate(tokenDto, formDto);
-
-    }
-
-
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiEvaluateController.java

@@ -1,81 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
-import com.elink.esua.epdc.service.ActInfoService;
-import com.elink.esua.epdc.service.EvaluateService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 移动端接口-项目模块
- * @Author LPF
- * @Date 2019/11/18 13:32
- */
-@RestController
-@RequestMapping("custom/evaluate")
-public class ApiEvaluateController {
-
-    @Autowired
-    private EvaluateService evaluateService;
-
-
-    /**
-     * 街道干部列表
-     * @Params: [ formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.EvaluateOfficerAppResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("getDeptOfficer")
-    public Result<List<EvaluateOfficerAppResultDTO>> getDeptOfficer(@LoginUser TokenDto tokenDto) {
-        EvaluateOfficerAppFormDTO formDto = new EvaluateOfficerAppFormDTO();
-        formDto.setGridId(tokenDto.getGridId());
-        return evaluateService.getDeptOfficer(formDto);
-    }
-    /**
-     * 评价列表
-     * @Params: [ formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.EvaluateOfficerAppResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("getOptionList")
-    public Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto) {
-        return evaluateService.getOptionList(formDto);
-    }
-    /**
-     * 评价状态
-     * @Params: [ formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @GetMapping("getAvailable")
-    public Result<RoleResultDTO> getAvailable() {
-        return evaluateService.getAvailable();
-    }
-    /**
-     * 评价提交
-     * @Params: [ formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.EvaluateOfficerAppResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    @PostMapping("evaluateSubmit")
-    public Result evaluateSubmit(EvaluateSubmitFormDTO formDto, @LoginUser TokenDto tokenDto) {
-        formDto.setFullName(tokenDto.getRealName());
-        formDto.setMobile(tokenDto.getMobile());
-        return evaluateService.evaluateSubmit(formDto);
-    }
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java

@@ -43,7 +43,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("ma")
 public class ApiScanSwitchController {
-
+    
     @Autowired
     private ScanSwitchService scanSwitchService;
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java

@@ -1,42 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.result.EpdcAppVolunteerRankDTO;
-import com.elink.esua.epdc.service.AppVolunteerRankService;
-import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * APP爱心排名
- *
- * @author wanggongfeng
- * @date 2019/12/17 10:30
- */
-@RestController
-@RequestMapping("heart/volunteer")
-public class ApiVolunteerRankController {
-
-    @Autowired
-    private AppVolunteerRankService appVolunteerRankService;
-
-    /**
-     * 获取排行榜
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @GetMapping("leaderboard")
-    public Result<List<EpdcAppVolunteerRankDTO>> leaderboard() {
-        Result<List<EpdcVolunteerRankDTO>> data = appVolunteerRankService.leaderboard();
-        List<EpdcAppVolunteerRankDTO> list2 = ConvertUtils.sourceToTarget(data.getData(), EpdcAppVolunteerRankDTO.class);
-        return new Result().ok(list2);
-
-    }
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java

@@ -1,37 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.service.DemoService;
-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 java.util.Map;
-
-/**
- * 移动端接口-评论模块
- *
- * @Author WJP
- * @Date 2019/9/9 09:45
- */
-@RestController
-@RequestMapping("demo")
-public class DemoController {
-
-    @Autowired
-    private DemoService demoService;
-
-    /**
-     * 事务
-     *
-     * @return
-     */
-    @PostMapping("seata")
-    public Result demo(@RequestBody Map<String, Object> map) {
-        return demoService.demo(map);
-    }
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java

@@ -1,68 +0,0 @@
-package com.elink.esua.epdc.feign;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.config.FeignRequestInterceptor;
-import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-
-/**
- * 活动模块调用-移动app端
- * @Author LPF
- * @Date 2019/11/18 16:39
- */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActInfoFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
-public interface ActInfoFeignClient {
-
-
-
-    /**
-     * 活动列表
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ActInfoAppFormDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @GetMapping(value = "heart/appactinfo/list", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto);
-
-    /**
-     * 活动列表（已报名）
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ActInfoAppFormDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @GetMapping(value = "heart/appactinfo/signupList", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto);
-    /**
-     * 活动详情
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @GetMapping(value = "heart/appactinfo/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto);
-
-    @GetMapping(value = "heart/appactinfo/rejectdetail", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
-
-    @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
-
-    @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ActBannerDTO>> getBannerList();
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -60,10 +60,11 @@ public interface AdminFeignClient {
     Result<GridLeaderRegisterDTO> listGridWhileLeaderRegister(@PathVariable("mobile") String mobile);
 
     /**
+     *
      * 根据openId获取用户信息
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysUserDTO>
      * @params [openId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.SysUserDTO>
      * @author liuchuang
      * @since 2019/11/19 17:43
      */

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java

@@ -1,35 +0,0 @@
-package com.elink.esua.epdc.feign;
-
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.fallback.AppActPhraseFeignClientFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-/**
- *
- * 活动报名管理
- *
- * @Author：wanggongfeng
- * @Date：2019/12/16 17:36
- */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActPhraseFeignClientFallback.class)
-public interface AppActPhraseFeignClient {
-
-    /**
-     * 常用语加一
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("heart/appactphrase/sagenumAddOneById/{id}")
-    Result sagenumAddOneById(@PathVariable("id")String id);
-
-    /**
-     * redis获取常用语列表
-     * @return
-     */
-    @GetMapping("heart/appactphrase/getPhraseList")
-    Result getPhraseList();
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java

@@ -1,66 +0,0 @@
-package com.elink.esua.epdc.feign;
-
-import com.elink.esua.epdc.activity.ActUserRelationDTO;
-import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
-import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
-import com.elink.esua.epdc.activity.AppClockListDTO;
-import com.elink.esua.epdc.activity.result.AppActInfoDTO;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.fallback.AppActUserRelationFeignClientFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-/**
- *
- * 活动报名管理
- *
- * @Author：wanggongfeng
- * @Date：2019/12/16 17:36
- */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActUserRelationFeignClientFallback.class)
-public interface AppActUserRelationFeignClient {
-
-    /**
-     * 活动报名
-     * @param actUserRelationDTO
-     * @return
-     */
-    @GetMapping(value = "heart/appactuserrelation/activitySignUp",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result activitySignUp(ActUserRelationDTO actUserRelationDTO);
-
-    /**
-     * 取消活动报名
-     * @param epdcAppActUserCancelsignupDTO
-     * @return
-     */
-    @GetMapping("heart/appactuserrelation/activityCancelSignUp")
-    Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO);
-
-    /**
-     * 活动打卡
-     * @param appActUserClockLogDTO
-     * @return
-     */
-    @GetMapping(value = "heart/appactuserclocklog/activityClock",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO);
-
-    /**
-     * 通过活动ID查询打卡列表
-     * @param actId
-     * @return
-     */
-    @GetMapping(value = "heart/appactuserrelation/selectListActUserRelation/{actId}")
-    Result<AppClockListDTO> selectListActUserRelation(@PathVariable("actId") String actId);
-
-    /**
-     * 获取活动打卡地点详情
-     * @param actId
-     * @return
-     */
-    @GetMapping("heart/appactinfo/clockAddressDetail/{actId}")
-    Result<AppActInfoDTO> clockAddressDetail(@PathVariable("actId") String actId);
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java

@@ -1,28 +0,0 @@
-package com.elink.esua.epdc.feign;
-
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.fallback.AppVolunteerRankFeignClientFallback;
-import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import java.util.List;
-
-/**
- *
- * 活动报名管理
- *
- * @Author：wanggongfeng
- * @Date：2019/12/16 17:36
- */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppVolunteerRankFeignClientFallback.class)
-public interface AppVolunteerRankFeignClient {
-
-    /**
-     * 获取排行榜
-     * @return
-     */
-    @GetMapping("heart/volunteer/leaderboard")
-    Result<List<EpdcVolunteerRankDTO>> leaderboard();
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java

@@ -3,8 +3,8 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
+import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
-import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
 import com.elink.esua.epdc.feign.fallback.CommentFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -22,7 +22,7 @@ public interface CommentFeignClient {
 
 
     @PostMapping(value = "events/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result submit(SubmitCommentFormDTO submitCommentFormDTO);
+    Result submit(CommentFormDTO commentFormDTO);
 
     /**
      * 评论列表

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/EvaluateFeignClient.java

@@ -1,79 +0,0 @@
-package com.elink.esua.epdc.feign;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.config.FeignRequestInterceptor;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
-import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback;
-import com.elink.esua.epdc.feign.fallback.EvaluateFeignClientFallback;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-/**
- * 评价模块调用-移动app端
- * @Author LPF
- * @Date 2019/11/18 16:39
- */
-@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = EvaluateFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
-public interface EvaluateFeignClient {
-
-
-
-    /**
-     * 街道干部列表
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.EvaluateOfficerAppResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @GetMapping(value = "custom/evaluateofficer/getDeptOfficer", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EvaluateOfficerAppResultDTO>> getDeptOfficer(EvaluateOfficerAppFormDTO formDto);
-
-    /**
-     * 评价列表
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.EvaluateOptionAppResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @GetMapping(value = "custom/evaluateoption/getOptionList", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto);
-    /**
-     * 评价提交
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @PostMapping(value = "custom/evaluateinfo/evaluateSubmit", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result evaluateSubmit(EvaluateSubmitFormDTO formDto);
-
-    /**
-     * 评价状态
-     * @Params: [formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:42
-     */
-    @PostMapping(value = "custom/evaluaterole/getAppAvailable", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<RoleResultDTO> getAvailable();
-
-
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java

@@ -2,15 +2,12 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 文件对象模块
@@ -41,14 +38,4 @@ public interface OssFeignClient {
      */
     @PostMapping(value = "oss/file/uploadFile", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> uploadFile(UploadToOssDTO uploadToOssDto);
-
-    /**
-     * @param avatarUrl
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UploadDTO>
-     * @Author yinzuomei
-     * @Description 上传微信头像
-     * @Date 2019/12/20 9:33
-     **/
-    @GetMapping(value="oss/file/saveWeChatFaceImg")
-    Result<UploadDTO> saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -2,19 +2,16 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -189,7 +186,7 @@ public interface UserFeignClient {
      * 获取网格长管理的网格列表
      *
      * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List               <               com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:34
      */
@@ -222,13 +219,13 @@ public interface UserFeignClient {
     /**
      * 更新用户微信信息
      *
-     * @param userDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [userDTO]
      * @author liuchuang
      * @since 2019/10/25 17:07
      */
     @PostMapping("app-user/epdc-app/user/updateWxInfo")
-    Result<UserDTO> updateWxInfo(UserDTO userDTO);
+    Result updateWxInfo(UserDTO userDTO);
 
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
@@ -240,10 +237,11 @@ public interface UserFeignClient {
     Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
 
     /**
+     *
      * 获取用户最后一次切换的网格信息
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
      * @params [openId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
      * @author liuchuang
      * @since 2019/12/6 11:04
      */
@@ -307,12 +305,12 @@ public interface UserFeignClient {
      * @Date 2019/11/22 14:22
      **/
     @PostMapping("app-user/epdc-app/usergrid/removeGrid")
-    Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
+	Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
 
     /**
      * 获取邀请记录
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List.UserInvitationRecordResultDTO < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List.UserInvitationRecordResultDTO              <               com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
      * @author work@yujt.net.cn
      * @date 2019/10/23 13:34
      */
@@ -326,49 +324,6 @@ public interface UserFeignClient {
      * @Description 根据openId或者unionId查询用户信息
      * @Date 2019/12/7 14:11
      **/
-    @PostMapping(value = "app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value="app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO);
-
-    /**
-     * <<<<<<< HEAD
-     * 需要缓存的用户信息
-     *
-     * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
-     * @author rongchao
-     * @since 2019-12-18
-     */
-    @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO);
-
-    /**
-     * 根据用户ID需要缓存的用户信息
-     *
-     * @param userId
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CachingUserInfoDTO>
-     * @author rongchao
-     * @since 2019-12-19
-     */
-    @GetMapping(value = "app-user/epdc-app/user/needCachingUserInfoByUserId/{userId}")
-    Result<CachingUserInfoDTO> needCachingUserInfoByUserId(@PathVariable("userId") String userId);
-
-    /**
-     * 志愿者认证
-     *
-     * @param userId
-     * @return
-     */
-    @GetMapping("app-user/epdc-app/volunteerinfo/getVolunteerCountById/{userId}")
-    Result<Integer> getVolunteerCountById(@PathVariable("userId") String userId);
-
-    /**
-     * 添加志愿者
-     *
-     * @param epdcCompleteVolunteerInfoFormDTO
-     * @return
-     */
-    @GetMapping("app-user/epdc-app/volunteerinfo/insertVolunteerInfo")
-    Result<Integer> insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO);
-
-
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java

@@ -1,54 +0,0 @@
-package com.elink.esua.epdc.feign.fallback;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
-import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.*;
-import com.elink.esua.epdc.feign.ActInfoFeignClient;
-import com.elink.esua.epdc.feign.WorkItemFeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-
-/**
- * @Author LPF
- * @Date 2019/11/18 16:39
- */
-@Component
-public class ActInfoFeignClientFallback implements ActInfoFeignClient {
-
-
-    @Override
-    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "listItems", formDto);
-    }
-    @Override
-    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "signupListItems", formDto);
-    }
-    @Override
-    public Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", formDto);
-    }
-    @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", formDto);
-    }
-    @Override
-    public Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getCancelDetail", id);
-    }
-    @Override
-    public Result<List<ActBannerDTO>> getBannerList() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList");
-    }
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java

@@ -1,25 +0,0 @@
-package com.elink.esua.epdc.feign.fallback;
-
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.AppActPhraseFeignClient;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author：wanggongfeng
- * @Date：2019/12/16 15:11
- */
-@Component
-public class AppActPhraseFeignClientFallback implements AppActPhraseFeignClient {
-
-    @Override
-    public Result sagenumAddOneById(String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "sagenumAddOneById", id);
-    }
-    @Override
-    public Result getPhraseList() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getPhraseList");
-    }
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java

@@ -1,44 +0,0 @@
-package com.elink.esua.epdc.feign.fallback;
-
-import com.elink.esua.epdc.activity.ActUserRelationDTO;
-import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
-import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
-import com.elink.esua.epdc.activity.result.AppActInfoDTO;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.AppActUserRelationFeignClient;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author：wanggongfeng
- * @Date：2019/12/16 15:11
- */
-@Component
-public class AppActUserRelationFeignClientFallback implements AppActUserRelationFeignClient {
-
-    @Override
-    public Result activitySignUp(ActUserRelationDTO actUserRelationDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activitySignUp", actUserRelationDTO);
-    }
-    @Override
-    public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", epdcAppActUserCancelsignupDTO);
-    }
-
-    @Override
-    public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityClock", appActUserClockLogDTO);
-    }
-
-    @Override
-    public Result selectListActUserRelation(String actId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "selectListActUserRelation", actId);
-    }
-
-    @Override
-    public Result<AppActInfoDTO> clockAddressDetail(String actId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "clockAddressDetail", actId);
-    }
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java

@@ -1,25 +0,0 @@
-package com.elink.esua.epdc.feign.fallback;
-
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient;
-import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Author：wanggongfeng
- * @Date：2019/12/16 15:11
- */
-@Component
-public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeignClient {
-
-    @Override
-    public Result<List<EpdcVolunteerRankDTO>> leaderboard() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "leaderboard");
-    }
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CommentFeignClientFallback.java

@@ -4,8 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
+import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
-import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
 import com.elink.esua.epdc.feign.CommentFeignClient;
 import org.springframework.stereotype.Component;
@@ -15,8 +15,8 @@ import org.springframework.stereotype.Component;
 public class CommentFeignClientFallback implements CommentFeignClient {
 
     @Override
-    public Result submit(SubmitCommentFormDTO submitCommentFormDTO) {
+    public Result submit(CommentFormDTO commentFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submit", submitCommentFormDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submit", commentFormDTO);
     }
 
     @Override

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/EvaluateFeignClientFallback.java

@@ -1,49 +0,0 @@
-package com.elink.esua.epdc.feign.fallback;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
-import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
-import com.elink.esua.epdc.feign.ActInfoFeignClient;
-import com.elink.esua.epdc.feign.EvaluateFeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-
-/**
- * @Author LPF
- * @Date 2019/11/18 16:39
- */
-@Component
-public class EvaluateFeignClientFallback implements EvaluateFeignClient {
-
-
-    @Override
-    public Result<List<EvaluateOfficerAppResultDTO>> getDeptOfficer(EvaluateOfficerAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getDeptOfficer", formDto);
-    }
-    @Override
-    public Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getOptionList", formDto);
-    }
-    @Override
-    public Result evaluateSubmit(EvaluateSubmitFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "evaluateSubmit", formDto);
-    }
-    @Override
-    public Result<RoleResultDTO> getAvailable() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getAvailable");
-    }
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java

@@ -3,7 +3,6 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.feign.OssFeignClient;
@@ -26,9 +25,4 @@ public class OssFeignClientFallback implements OssFeignClient {
     public Result<String> uploadFile(UploadToOssDTO uploadToOssDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadFile", uploadToOssDto);
     }
-
-    @Override
-    public Result<UploadDTO> saveWeChatFaceImg(String avatarUrl) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl);
-    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -3,7 +3,6 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.dto.UserWxFormIdDTO;
@@ -108,7 +107,7 @@ public class UserFeignClientFallback implements UserFeignClient {
     }
 
     @Override
-    public Result<UserDTO> updateWxInfo(UserDTO userDTO) {
+    public Result updateWxInfo(UserDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateWxInfo", userDTO);
     }
 
@@ -151,7 +150,6 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "removeGrid", formDto);
     }
-
     @Override
     public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "invitationRecord");
@@ -159,26 +157,6 @@ public class UserFeignClientFallback implements UserFeignClient {
 
     @Override
     public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto",formDTO);
-    }
-
-    @Override
-    public Result<CachingUserInfoDTO> needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO);
-    }
-
-    @Override
-    public Result<CachingUserInfoDTO> needCachingUserInfoByUserId(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfoByUserId", userId);
-    }
-
-    @Override
-    public Result<Integer> getVolunteerCountById(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerCountById", userId);
-    }
-
-    @Override
-    public Result<Integer> insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertVolunteerInfo", epdcCompleteVolunteerInfoFormDTO);
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java

@@ -15,5 +15,4 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/demo" + Constant.VERSION_CONTROL)
 public class DemoV2Controller {
 
-
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java

@@ -1,53 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.result.*;
-
-import java.util.List;
-
-/**
- * 项目模块-移动App端
- * @Author LPF
- * @Date 2019/11/18 13:34
- */
-public interface ActInfoService {
-
-
-    /**
-     * 活动列表
-     * @Params: [userDetail, formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:37
-     */
-    Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto);
-    /**
-     * 活动列表（已报名）
-     * @Params: [userDetail, formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:37
-     */
-    Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto);
-    /**
-     * 项目详情
-     * @Params: [userDetail, itemId]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto);
-
-    Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
-
-    Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId);
-
-    Result<List<ActBannerDTO>> getBannerList();
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java

@@ -1,30 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-
-/**
- * @author wanggongfeng
- * @date 2019/12/17 9:50
- */
-public interface ActPhraseService {
-
-    /**
-     * 常用语使用次数加一
-     * @param id
-     * @Author wanggongfeng
-     * @return
-     */
-    Result sagenumAddOneById(String id);
-
-    /**
-     * redis获取常用语
-     * @Author wanggongfeng
-     * @return
-     */
-    Result getPhraseList();
-
-
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java

@@ -1,56 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.activity.ActUserRelationDTO;
-import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
-import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
-import com.elink.esua.epdc.activity.AppClockListDTO;
-import com.elink.esua.epdc.activity.result.AppActInfoDTO;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-
-/**
- * @author wanggongfeng
- * @date 2019/12/17 9:50
- */
-public interface ActUserRelationService {
-
-    /**
-     * 活动报名
-     * @param actUserRelationDTO
-     * @Author wanggongfeng
-     * @return
-     */
-    Result activitySignUp(ActUserRelationDTO actUserRelationDTO);
-
-    /**
-     * 取消活动报名
-     * @param epdcAppActUserCancelsignupDTO
-     * @Author wanggongfeng
-     * @return
-     */
-    Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO);
-
-    /**
-     * 活动打卡
-     * @param appActUserClockLogDTO
-     * @Author wanggongfeng
-     * @return
-     */
-    Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO);
-
-    /**
-     * 获取打卡列表
-     * @param actId
-     * @Author wanggongfeng
-     * @return
-     */
-    Result<AppClockListDTO> getClockList(String actId);
-
-    /**
-     * 获取活动打卡地点详情
-     * @param actId
-     * @Author wanggongfeng
-     * @return
-     */
-    Result<AppActInfoDTO> clockAddressDetail(String actId);
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -7,8 +7,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 
 import java.util.List;
@@ -216,26 +216,4 @@ public interface AppUserService {
      * @Date 2019/12/7 14:32
      **/
 	Result checkWxUnionId(TokenDto tokenDto);
-
-    /**
-     * 志愿者认证
-     * @param tokenDto
-     * @param formDto
-     * @Author wanggongfeng
-     * @return
-     */
-    Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto);
-
-    /**
-     * 验证是否为志愿者
-     *
-     * @param tokenDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    Result getVolunteerCountById(TokenDto tokenDto);
-
-
-
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java

@@ -1,22 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
-
-import java.util.List;
-
-/**
- * @author wanggongfeng
- * @date 2019/12/17 9:50
- */
-public interface AppVolunteerRankService {
-
-    /**
-     * 获取排行榜
-     * @Author wanggongfeng
-     * @return
-     */
-    Result<List<EpdcVolunteerRankDTO>> leaderboard();
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/DemoService.java

@@ -1,26 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-
-import java.util.Map;
-
-/**
- * Demo
- *
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/6/5 14:10
- */
-public interface DemoService {
-
-    /**
-     * 测试分布式事务
-     *
-     * @param map
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author rongchao
-     * @since 2020-01-09
-     */
-    Result demo(Map<String, Object> map);
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/EvaluateService.java

@@ -1,55 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
-
-import java.util.List;
-
-/**
- * 项目模块-移动App端
- * @Author LPF
- * @Date 2019/11/18 13:34
- */
-public interface EvaluateService {
-
-
-    /**
-     * 街道干部列表
-     * @Params: [userDetail, formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:37
-     */
-    Result<List<EvaluateOfficerAppResultDTO>> getDeptOfficer(EvaluateOfficerAppFormDTO formDto);
-    /**
-     * 评价列表
-     * @Params: [userDetail, formDto]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:37
-     */
-    Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto);
-
-    Result<RoleResultDTO> getAvailable();
-    /**
-     * 评价提交
-     * @Params: [userDetail, itemId]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
-     * @Author: lipengfei
-     * @Date: 2019/11/19 16:34
-     */
-    Result evaluateSubmit(EvaluateSubmitFormDTO formDto);
-
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java

@@ -1,59 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.activity.ActBannerDTO;
-import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
-import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
-import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.*;
-import com.elink.esua.epdc.feign.ActInfoFeignClient;
-import com.elink.esua.epdc.feign.WorkItemFeignClient;
-import com.elink.esua.epdc.service.ActInfoService;
-import com.elink.esua.epdc.service.WorkItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目模块-移动app端
- * @Author LPF
- * @Date 2019/11/18 16:34
- */
-@Service
-public class ActInfoServiceImpl implements ActInfoService {
-
-    @Autowired
-    private ActInfoFeignClient actInfoFeignClient;
-
-
-
-    @Override
-    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto) {
-        return actInfoFeignClient.listItems(formDto);
-    }
-    @Override
-    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto) {
-        return actInfoFeignClient.signupListItems(formDto);
-    }
-
-    @Override
-    public Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto) {
-        return actInfoFeignClient.getDetail(formDto);
-    }
-    @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto) {
-        return actInfoFeignClient.getRejectDetail(formDto);
-    }
-    @Override
-    public Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId) {
-        return actInfoFeignClient.getCancelDetail(itemId);
-    }
-    @Override
-    public Result<List<ActBannerDTO>> getBannerList() {
-        return actInfoFeignClient.getBannerList();
-    }
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java

@@ -1,36 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.AppActPhraseFeignClient;
-import com.elink.esua.epdc.service.ActPhraseService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @author wanggongfeng
- * @date 2019/12/16 17:50
- */
-@Slf4j
-@Service
-public class ActPhraseServiceImpl implements ActPhraseService {
-
-    @Autowired
-    private AppActPhraseFeignClient appActPhraseFeignClient;
-
-    @Override
-    public Result sagenumAddOneById(String id) {
-        Result<Integer> dataResult = appActPhraseFeignClient.sagenumAddOneById(id);
-        return dataResult;
-    }
-
-    @Override
-    public Result getPhraseList() {
-        Result<Integer> dataResult = appActPhraseFeignClient.getPhraseList();
-        return dataResult;
-    }
-
-
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java

@@ -1,57 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.activity.ActUserRelationDTO;
-import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO;
-import com.elink.esua.epdc.activity.AppActUserClockLogDTO;
-import com.elink.esua.epdc.activity.AppClockListDTO;
-import com.elink.esua.epdc.activity.result.AppActInfoDTO;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.AppActUserRelationFeignClient;
-import com.elink.esua.epdc.service.ActUserRelationService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @author wanggongfeng
- * @date 2019/12/16 17:50
- */
-@Slf4j
-@Service
-public class ActUserRelationServiceImpl implements ActUserRelationService {
-
-    @Autowired
-    private AppActUserRelationFeignClient actInfoFeignClient;
-
-    @Override
-    public Result activitySignUp(ActUserRelationDTO actUserRelationDTO) {
-        Result<Integer> dataResult = actInfoFeignClient.activitySignUp(actUserRelationDTO);
-        return dataResult;
-    }
-
-    @Override
-    public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) {
-        Result<Integer> dataResult = actInfoFeignClient.activityCancelSignUp(epdcAppActUserCancelsignupDTO);
-        return dataResult;
-    }
-
-    @Override
-    public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
-        Result<Integer> dataResult = actInfoFeignClient.activityClock(appActUserClockLogDTO);
-        return dataResult;
-    }
-
-    @Override
-    public Result<AppClockListDTO> getClockList(String actId) {
-        Result<AppClockListDTO> result = actInfoFeignClient.selectListActUserRelation(actId);
-        return result;
-    }
-
-    @Override
-    public Result<AppActInfoDTO> clockAddressDetail(String actId) {
-        Result<AppActInfoDTO> dataResult = actInfoFeignClient.clockAddressDetail(actId);
-        return dataResult;
-    }
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -5,10 +5,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.elink.esua.epdc.async.GroupTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
-import com.elink.esua.epdc.common.token.util.IdentityNoAnalysisUtil;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
-import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
@@ -17,22 +15,20 @@ import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
 import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
-import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
+import com.elink.esua.epdc.enums.*;
-import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
-import com.elink.esua.epdc.enums.AppUserRegisterWayEnum;
-import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.feign.OssFeignClient;
@@ -41,7 +37,6 @@ import com.elink.esua.epdc.jwt.JwtTokenProperties;
 import com.elink.esua.epdc.jwt.JwtTokenUtils;
 import com.elink.esua.epdc.redis.AppUserRedis;
 import com.elink.esua.epdc.service.AppUserService;
-import com.elink.esua.epdc.utils.UserTagUtils;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -49,8 +44,6 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -72,7 +65,7 @@ import java.util.List;
 @Slf4j
 @Service
 public class AppUserServiceImpl implements AppUserService {
-    private static final Logger logger = LoggerFactory.getLogger(AppUserServiceImpl.class);
+
     @Autowired
     private AppUserRedis appUserRedis;
 
@@ -93,7 +86,6 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Autowired
     private JwtTokenProperties jwtTokenProperties;
-
     @Autowired
     private OssFeignClient ossFeignClient;
 
@@ -214,7 +206,7 @@ public class AppUserServiceImpl implements AppUserService {
         EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO();
         formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
         formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid());
-        Result<CachingUserInfoDTO> userInfoResult = userFeignClient.needCachingUserInfo(formDTO);
+        Result<UserDTO> userInfoResult = userFeignClient.queryUserDto(formDTO);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());
         }
@@ -229,7 +221,7 @@ public class AppUserServiceImpl implements AppUserService {
      * @author work@yujt.net.cn
      * @date 2019/9/19 19:17
      */
-    private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto) {
+    private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(UserDTO userDto) {
 
         EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO();
         // 用户未注册
@@ -238,9 +230,10 @@ public class AppUserServiceImpl implements AppUserService {
             return new Result().ok(authorization);
         }
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
+        tokenDto.setUserId(userDto.getId());
 
         String state = userDto.getState();
-        authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), state);
+        authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), userDto.getState());
 
         Result result = new Result().ok(authorization);
         // 已注册，未完善信息
@@ -290,6 +283,12 @@ public class AppUserServiceImpl implements AppUserService {
         // 组装用户注册信息
         EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode());
         List<UserGridRelationDTO> userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class);
+        for (UserGridRelationDTO item : userGridList) {
+            item.setAllDeptNames(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity() + "-" + item.getGrid());
+            item.setAllDeptIds(item.getDistrictId() + "," + item.getStreetId() + "," + item.getCommunityId() + "," + item.getGridId());
+            item.setParentDeptIds(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity());
+            item.setParentDeptNames(item.getDistrictId() + "," + item.getStreetId() + "," + item.getCommunityId());
+        }
         EpdcGridLeaderRegisterFormDTO registerDto = new EpdcGridLeaderRegisterFormDTO();
         registerDto.setGridLeader(gridLeaderRegister);
         registerDto.setUserGridList(userGridList);
@@ -665,7 +664,21 @@ public class AppUserServiceImpl implements AppUserService {
         WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode());
         String openId = wxMaResult.getOpenid();
         String unionId = wxMaResult.getUnionid();
-
+//        if (null == formDto.getGridId()) {
+//            // 获取用户绑定网格信息
+//            Result<EpdcUserRegisterInfoResultDTO> dtoResult = userFeignClient.getUserLastSwitchGrid(openId);
+//            if (!dtoResult.success()) {
+//                return new Result<EpdcAppAuthorizationDTO>().error(dtoResult.getMsg());
+//            }
+//            EpdcUserRegisterInfoResultDTO userDto = dtoResult.getData();
+//            if (userDto.getRegisterState() != NumConstant.TWO) {
+//                EpdcAppAuthorizationDTO resultDto = new EpdcAppAuthorizationDTO();
+//                resultDto.setUserState(NumConstant.FIVE_STR);
+//                return new Result<EpdcAppAuthorizationDTO>().ok(resultDto);
+//            } else {
+//                formDto.setGridId(userDto.getGridId());
+//            }
+//        }
         // 查询当前微信注册状态
         EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO();
         checkFromDto.setOpenId(openId);
@@ -778,7 +791,6 @@ public class AppUserServiceImpl implements AppUserService {
                 return new Result().error("解析微信开放平台ID失败");
             }
             userDto.setWxUnionId(wxMaUserInfo.getUnionId());
-            userDto.setWxOpenId(wxMaUserInfo.getOpenId());
         }
 
         // 党员提交，验证身份证号
@@ -823,26 +835,22 @@ public class AppUserServiceImpl implements AppUserService {
             }
             return new Result().error(completeResult.getMsg());
         }
-
+        UserDTO user = completeResult.getData();
-        tokenDto.setUserId(completeResult.getData().getId());
+        tokenDto.setRealName(user.getRealName());
-
+        tokenDto.setNickname(user.getNickname());
-        //更新用户缓存信息
+        tokenDto.setMobile(user.getMobile());
-        Result<CachingUserInfoDTO> cachingUserResult = userFeignClient.needCachingUserInfoByUserId(tokenDto.getUserId());
+        tokenDto.setPartyFlag(user.getPartyFlag());
-        CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData();
+        EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState());
-        TokenDto newTokenDto = ConvertUtils.sourceToTarget(cachingUserInfoDTO, TokenDto.class);
-        tokenDto.setUserId(userDto.getId());
-        EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(newTokenDto, userGrid.getGrid(), userDto.getState());
 
         // 更新社群用户党员标识并加入关联的所有网格党员群
-        boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
+        if (NumConstant.ONE_STR.equals(user.getPartyFlag())) {
-        if (partyFlag) {
             GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO();
-            formDto.setUserId(cachingUserInfoDTO.getUserId());
+            formDto.setUserId(user.getId());
-            formDto.setPartyMember(partyFlag ? NumConstant.ZERO_STR : NumConstant.ONE_STR);
+            formDto.setPartyMember(user.getPartyFlag());
-            formDto.setNickname(cachingUserInfoDTO.getNickname());
+            formDto.setNickname(user.getNickname());
-            formDto.setUserAvatar(cachingUserInfoDTO.getFaceImg());
+            formDto.setUserAvatar(user.getFaceImg());
-            formDto.setMobile(cachingUserInfoDTO.getMobile());
+            formDto.setMobile(user.getMobile());
-            formDto.setDeptId(cachingUserInfoDTO.getGridId());
+            formDto.setDeptId(user.getDeptId());
             formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
             groupFeignClient.updateUserPartyMember(formDto);
@@ -968,13 +976,7 @@ public class AppUserServiceImpl implements AppUserService {
         UserDTO userDTO = new UserDTO();
         userDTO.setId(userDetail.getUserId());
         userDTO.setNickname(wxMaUserInfo.getNickName());
-        //上传微信头像
+        userDTO.setFaceImg(wxMaUserInfo.getAvatarUrl());
-        Result<UploadDTO> uploadDTOResult = ossFeignClient.saveWeChatFaceImg(wxMaUserInfo.getAvatarUrl());
-        if (uploadDTOResult.success()) {
-            userDTO.setFaceImg(uploadDTOResult.getData().getUrl());
-        } else {
-            userDTO.setFaceImg(USER_FACE);
-        }
         //微信性别0未知 1:男  2：女 本系统：1男,0女
         if (UserSexEnum.WX_MALE.sex().equals(wxMaUserInfo.getGender())) {
             userDTO.setSex(UserSexEnum.MALE.sex());
@@ -985,28 +987,21 @@ public class AppUserServiceImpl implements AppUserService {
             userDTO.setSex("");
         }
         userDTO.setWxUnionId(wxMaUserInfo.getUnionId());
-        userDTO.setWxOpenId(wxMaUserInfo.getOpenId());
+        Result updateWxInfoResult = userFeignClient.updateWxInfo(userDTO);
-        Result<UserDTO> updateWxInfoResult = userFeignClient.updateWxInfo(userDTO);
         if (!updateWxInfoResult.success()) {
             return new Result().error("更新用户信息失败");
         }
 
-        UserDTO oldUser = updateWxInfoResult.getData();
-        // 注销原来的登录信息
-        cpUserDetailRedis.logout(userDetail.getUserId());
-
         // 更新用户缓存信息
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDTO, TokenDto.class);
-        // 在迁移小程序后，olduser的id和userDetail的id可能不一样。
+        tokenDto.setUserId(userDetail.getUserId());
-        tokenDto.setUserId(oldUser.getId());
         tokenDto.setGridId(userDetail.getGridId());
         tokenDto.setMobile(userDetail.getMobile());
-        tokenDto.setUserTagInfos(userDetail.getUserTagInfos());
+        tokenDto.setPartyFlag(userDetail.getPartyFlag());
         tokenDto.setRealName(userDetail.getRealName());
-        tokenDto.setMobile(oldUser.getMobile());
+        long expire = cpUserDetailRedis.getExpire(userDetail.getUserId());
-        tokenDto.setRealName(oldUser.getRealName());
+        cpUserDetailRedis.logout(userDetail.getUserId());
-        // 保证用户手机上的token仍然可用
+        cpUserDetailRedis.set(tokenDto, expire);
-        cpUserDetailRedis.set(tokenDto, jwtTokenProperties.getExpire(), userDetail.getUserId());
 
         return new Result();
     }
@@ -1087,143 +1082,4 @@ public class AppUserServiceImpl implements AppUserService {
         }
         return result;
     }
-
-    /**
-     * 志愿者认证
-     *
-     * @param tokenDto
-     * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggongfeng
-     * @date 2019/12/13 14:41
-     */
-    @Override
-    public Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto) {
-        logger.info("志愿者认证wxCode="+formDto.getWxCode()+";userId="+tokenDto.getUserId());
-        String sex = IdentityNoAnalysisUtil.getSex(formDto.getIdentityNo());         // 身份证解析性别
-        if (sex.equals("女")){
-            sex = "0";
-        }else {
-            sex = "1";
-        }
-        Date birthday = IdentityNoAnalysisUtil.getBirthDay(formDto.getIdentityNo()); // 身份证解析生日
-        formDto.setSex(sex);                     // 性别
-        formDto.setBirthday(birthday);           // 生日
-        formDto.setUserId(tokenDto.getUserId()); // 用户ID
-        // 验证是否为志愿者
-        Result<Integer> volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId());
-        if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) {
-            return new Result().error("志愿者认证失败");
-        } else if (volunteerCountResult.getData() == 0) {
-            // 添加志愿者
-            Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(formDto);
-        }
-
-        // 调用用户完善个人信息-保存
-        EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class);
-        if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
-            epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志
-        } else {
-            epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志
-        }
-        Result<EpdcAppAuthorizationDTO> result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO);
-
-        return result;
-    }
-
-    /**
-     * 查询是否为志愿者
-     *
-     * @param tokenDto
-     * @return
-     */
-    @Override
-    public Result getVolunteerCountById(TokenDto tokenDto) {
-        Result result = new Result();
-        Result<Integer> volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId());
-        if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) {
-            result.error("志愿者验证错误");
-        } else {
-            if (volunteerCountResult.getData() == 0) {
-                result.error("该用户不是志愿者");
-            } else {
-                result.setMsg("志愿者认证通过");
-            }
-        }
-        return result;
-    }
-
-    public Result<EpdcAppAuthorizationDTO> completeUserInfoNoVerifyCode(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
-
-        UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
-        userDto.setDeptId(Long.valueOf(infoDto.getGridId()));
-        userDto.setId(tokenDto.getUserId());
-
-        if (StringUtils.isNotBlank(infoDto.getWxCode())) {
-            String sessionKey = this.getUserSessionKey(infoDto.getWxCode());
-            WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv());
-            if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
-                return new Result().error("解析微信开放平台ID失败");
-            }
-            userDto.setWxUnionId(wxMaUserInfo.getUnionId());
-            userDto.setWxOpenId(wxMaUserInfo.getOpenId());
-        }
-
-        // 党员提交，验证身份证号
-        if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
-            String identityNo = userDto.getIdentityNo();
-            if (StringUtils.isBlank(identityNo)) {
-                return new Result().error("身份证号不能为空");
-            } else {
-                String verification = IdentityNoUtils.IdentityNoVerification(identityNo);
-                if (StringUtils.isNotBlank(verification)) {
-                    return new Result().error(verification);
-                }
-            }
-        }
-        // 验证手机号验证码
-        //this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode());
-        // 验证用户提交的信息
-        Result<String> verifyResult = userFeignClient.verifyUserCompleteData(userDto);
-        if (!verifyResult.success()) {
-            return new Result().error(verifyResult.getMsg());
-        }
-        String userState = verifyResult.getData();
-
-        UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(infoDto.getGridId());
-        EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);
-        completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState);
-        // 组装对象，准备保存用户信息
-        EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO();
-        dto.setCompleteAppUser(completeAppUserDto);
-        dto.setUserGridRelation(userGrid);
-
-        Result<UserDTO> completeResult = userFeignClient.completeUserInfo(dto);
-        if (!completeResult.success()) {
-            return new Result().error(completeResult.getMsg());
-        }
-        UserDTO user = completeResult.getData();
-        tokenDto.setRealName(user.getRealName());
-        tokenDto.setNickname(user.getNickname());
-        tokenDto.setMobile(user.getMobile());
-        EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState());
-
-        // 更新社群用户党员标识并加入关联的所有网格党员群
-        if (NumConstant.ONE_STR.equals(user.getPartyFlag())) {
-            GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO();
-            formDto.setUserId(user.getId());
-            formDto.setPartyMember(user.getPartyFlag());
-            formDto.setNickname(user.getNickname());
-            formDto.setUserAvatar(user.getFaceImg());
-            formDto.setMobile(user.getMobile());
-            formDto.setDeptId(user.getGridId());
-            formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
-
-            groupTask.updateUserPartyMember(formDto);
-        }
-
-        return new Result().ok(authorizationDto);
-    }
-
-
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java

@@ -1,36 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient;
-import com.elink.esua.epdc.service.AppVolunteerRankService;
-import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/**
- * @author wanggongfeng
- * @date 2019/12/16 17:50
- */
-@Slf4j
-@Service
-public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
-
-    @Autowired
-    private AppVolunteerRankFeignClient appVolunteerRankFeignClient;
-
-    /**
-     * 获取排行榜
-     * @Author wanggongfeng
-     * @return
-     */
-    @Override
-    public Result<List<EpdcVolunteerRankDTO>> leaderboard() {
-        Result<List<EpdcVolunteerRankDTO>> dataResult = appVolunteerRankFeignClient.leaderboard();
-        return dataResult;
-    }
-
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java

@@ -3,18 +3,13 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.async.WxMaSecCheckTask;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
-import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
-import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
 import com.elink.esua.epdc.feign.CommentFeignClient;
 import com.elink.esua.epdc.service.CommentService;
-import com.elink.esua.epdc.utils.UserTagUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,13 +37,7 @@ public class CommentServiceImpl implements CommentService {
         commentFormDTO.setUserId(userDetail.getUserId());
         commentFormDTO.setUserName(userDetail.getNickname());
         commentFormDTO.setUserFace(userDetail.getFaceImg());
-        SubmitCommentFormDTO submitCommentFormDTO = ConvertUtils.sourceToTarget(commentFormDTO, SubmitCommentFormDTO.class);
+        return commentFeignClient.submit(commentFormDTO);
-	    if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
-		    submitCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
-	    } else {
-		    submitCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value());
-	    }
-        return commentFeignClient.submit(submitCommentFormDTO);
     }
 
     @Override

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java

@@ -1,42 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.commons.tools.exception.RenException;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.ScanSwitchDTO;
-import com.elink.esua.epdc.feign.DemoFeignClient;
-import com.elink.esua.epdc.service.DemoService;
-import com.elink.esua.epdc.service.ScanSwitchService;
-import io.seata.spring.annotation.GlobalTransactional;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/9/11 9:40
- */
-@Service
-public class DemoServiceImpl implements DemoService {
-
-    @Autowired
-    private ScanSwitchService scanSwitchService;
-
-    @Autowired
-    private DemoFeignClient demoFeignClient;
-
-    @GlobalTransactional(rollbackFor = Exception.class)
-    @Override
-    public Result demo(Map<String, Object> map) {
-        ScanSwitchDTO dto = new ScanSwitchDTO();
-        dto.setId("54185412da2bea73804fc1de69827e18");
-        dto.setMaintainInfo(map.get("username").toString());
-        scanSwitchService.update(dto);
-        Result<String> r = demoFeignClient.seata(map.get("username").toString(), Integer.parseInt(map.get("age").toString()));
-        if (!r.success()) {
-            throw new RenException("添加失败");
-        }
-        return new Result();
-    }
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/EvaluateServiceImpl.java

@@ -1,49 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO;
-import com.elink.esua.epdc.feign.EvaluateFeignClient;
-import com.elink.esua.epdc.service.EvaluateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目模块-移动app端
- * @Author LPF
- * @Date 2019/11/18 16:34
- */
-@Service
-public class EvaluateServiceImpl implements EvaluateService {
-
-    @Autowired
-    private EvaluateFeignClient evaluateFeignClient;
-
-
-
-    @Override
-    public Result<List<EvaluateOfficerAppResultDTO>> getDeptOfficer(EvaluateOfficerAppFormDTO formDto) {
-        return evaluateFeignClient.getDeptOfficer(formDto);
-    }
-    @Override
-    public Result<List<EvaluateOptionAppResultDTO>> getOptionList(EvaluateOptionAppFormDTO formDto) {
-        return evaluateFeignClient.getOptionList(formDto);
-    }
-    @Override
-    public Result<RoleResultDTO> getAvailable() {
-        return evaluateFeignClient.getAvailable();
-    }
-
-
-    @Override
-    public Result evaluateSubmit(EvaluateSubmitFormDTO formDto){
-        return evaluateFeignClient.evaluateSubmit(formDto);
-    }
-}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java

@@ -2,24 +2,20 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
-import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
-import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.enums.GroupStateEnum;
-import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
+import com.elink.esua.epdc.dto.enums.GroupStateEnum;
+import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
+import com.elink.esua.epdc.dto.group.result.*;
-import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
-import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
-import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.service.GroupService;
-import com.elink.esua.epdc.utils.UserTagUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -67,10 +63,10 @@ public class GroupServiceImpl implements GroupService {
         groupUserFormDTO.setUserAvatar(userDetail.getFaceImg());
         groupUserFormDTO.setMobile(userDetail.getMobile());
         // 判断当前用户是否为党员
-        if (!UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
+        if (!NumConstant.ONE_STR.equals(userDetail.getPartyFlag())) {
             return new Result().error("您当前身份不是党员，不能创建社群");
         }
-        groupUserFormDTO.setPartyMember(YesOrNoEnum.YES.value());
+        groupUserFormDTO.setPartyMember(userDetail.getPartyFlag());
         groupUserFormDTO.setLordFlag(NumConstant.ONE_STR);
         groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
         formDto.setGroupUserFormDTO(groupUserFormDTO);
@@ -191,11 +187,7 @@ public class GroupServiceImpl implements GroupService {
         formDto.setNickname(userDetail.getNickname());
         formDto.setUserAvatar(userDetail.getFaceImg());
         formDto.setMobile(userDetail.getMobile());
-        if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
+        formDto.setPartyMember(userDetail.getPartyFlag());
-            formDto.setPartyMember(YesOrNoEnum.YES.value());
-        } else {
-            formDto.setPartyMember(YesOrNoEnum.NO.value());
-        }
         return groupFeignClient.applyForGroup(formDto);
     }
 }