From 86e91356ada0efeb77ea8edbc39a2694290b92a0 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Fri, 11 Dec 2020 10:55:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=A7=92=E8=89=B2=E5=90=B9=E5=93=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=90=B9=E5=93=A8=E9=83=A8=E9=97=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/SysRoleServiceImpl.java    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index 5d6a436f..e5bcbdc3 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -258,18 +258,14 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
 
         //保存角色与项目处理类型关系
         List<String> categoryIdList = dto.getCategoryIdList();
-        if (CollUtil.isNotEmpty(categoryIdList)) {
-            HandleRoleCategoryFormDTO categoryFormDTO = new HandleRoleCategoryFormDTO();
-            categoryFormDTO.setRoleId(entity.getId());
-            categoryFormDTO.setCategoryIdList(categoryIdList);
-            eventFeignClient.saveOrUpdateHandleCategory(categoryFormDTO);
-        }
+        HandleRoleCategoryFormDTO categoryFormDTO = new HandleRoleCategoryFormDTO();
+        categoryFormDTO.setRoleId(entity.getId());
+        categoryFormDTO.setCategoryIdList(categoryIdList);
+        eventFeignClient.saveOrUpdateHandleCategory(categoryFormDTO);
 
         List<Long> whistleDeptIdList = dto.getWhistleDeptIdList();
-        if (CollUtil.isNotEmpty(whistleDeptIdList)) {
-            //保存角色对应的可吹哨部门权限
-            this.saveOrUpdateWhistleDeptId(entity.getId(), whistleDeptIdList);
-        }
+        //保存角色对应的可吹哨部门权限
+        this.saveOrUpdateWhistleDeptId(entity.getId(), whistleDeptIdList);
     }
 
     /**

From 65db54f9349304db434d1c9486523ec08d9c9a00 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 11 Dec 2020 15:27:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=94=A6=E6=B0=B4=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/ImgConfigDTO.java   |  8 ++++++--
 .../elink/esua/epdc/entity/ImgConfigEntity.java |  7 ++++---
 .../src/main/resources/mapper/ImgConfigDao.xml  |  6 ++++--
 .../esua/epdc/service/impl/NewsServiceImpl.java | 17 ++++++++---------
 .../main/resources/mapper/ModuleCategoryDao.xml |  2 +-
 .../elink/esua/epdc/feign/UsersFeignClient.java |  6 +++---
 .../fallback/UsersFeignClientFallback.java      |  4 ++--
 .../esua/epdc/mq/PointsModifyConsumer.java      | 14 +++++++++-----
 .../esua/epdc/controller/UserController.java    | 14 ++++++++++++++
 .../java/com/elink/esua/epdc/dao/UserDao.java   |  8 ++++++++
 .../elink/esua/epdc/service/UserService.java    |  9 ++++++++-
 .../esua/epdc/service/impl/UserServiceImpl.java |  6 ++++++
 .../src/main/resources/mapper/UserDao.xml       |  7 +++++++
 13 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java
index 530831c6..c22e9d98 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java
@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -52,7 +53,10 @@ public class ImgConfigDTO implements Serializable {
      * 排序
      */
 	private Integer sort;
-
+    /**
+     * 启用标识  0：未启用    1：启用
+     */
+    private String enableFlag;
     /**
      * 乐观锁
      */
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java
index c55b9a25..b8d077a0 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java
@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 图片配置表
  *
@@ -62,4 +59,8 @@ public class ImgConfigEntity extends BaseEpdcEntity {
 	 * 备注
 	 */
 	private String remark;
+    /**
+     * 启用标识  0：未启用    1：启用
+     */
+    private String enableFlag;
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml
index fa976110..24a24964 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml
@@ -16,6 +16,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="imgCode" column="IMG_CODE"/>
         <result property="remark" column="REMARK"/>
+        <result property="enableFlag" column="ENABLE_FLAG"/>
     </resultMap>
 
     <select id="selectListImgConfig" resultType="com.elink.esua.epdc.dto.ImgConfigDTO">
@@ -26,7 +27,8 @@
             SORT sort,
             IMG_CODE imgCode,
             CREATED_TIME createdTime,
-            REMARK remark
+            REMARK remark,
+            ENABLE_FLAG
         FROM
             `epdc_img_config`
             WHERE DEL_FLAG = 0
@@ -44,7 +46,7 @@
           REMARK remark
         FROM
         `epdc_img_config`
-        WHERE DEL_FLAG = 0
+        WHERE DEL_FLAG = 0 and ENABLE_FLAG = '1'
             AND IMG_TYPE = #{imgType,jdbcType=VARCHAR}
         ORDER BY SORT,CREATED_TIME DESC
     </select>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
index cebe416d..7eba8244 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
@@ -21,6 +21,7 @@ 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.service.impl.BaseServiceImpl;
+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.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -28,26 +29,22 @@ 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.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NewsDao;
 import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
-import com.elink.esua.epdc.entity.BannerEntity;
-import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
-import com.elink.esua.epdc.entity.NewsUserReadEntity;
-import com.elink.esua.epdc.enums.AppNewsLikeEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
 import com.elink.esua.epdc.entity.NewsEntity;
+import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
+import com.elink.esua.epdc.enums.AppNewsLikeEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.*;
 import com.elink.esua.epdc.util.NewsUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -120,7 +117,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         if (StringUtils.isNotBlank(gridId)) {
             wrapper.like("ALL_DEPT_IDS", gridId.trim());
         }
-        wrapper.in("DEPT_ID", user.getDeptIdList());
+        if(user.getDeptIdList()!=null && user.getDeptIdList().size()>0){
+            wrapper.in("DEPT_ID", user.getDeptIdList());
+        }
         //draft 前端传上来的一个标志 有则代表是存草稿箱的 1
         if (StringUtils.isNotEmpty(draft)) {
             wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value());
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml
index c1e16db2..09cb807a 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml
@@ -26,7 +26,7 @@
     <select id="getList" resultType="com.elink.esua.epdc.entity.ModuleCategoryEntity">
          select t1.*,t1.id as value,t1.category_name as label,(select t2.category_name from epdc_module_category t2 where t2.id=t1.pid)parentName from epdc_module_category t1
  where t1.del_flag = '0'
-        order by t1.UPDATED_TIME desc,t1.sort
+        order by t1.sort
     </select>
 
     <select id="getListToShow" resultType="com.elink.esua.epdc.entity.ModuleCategoryEntity">
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
index 1fd09f99..fc0c1529 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
@@ -30,13 +30,13 @@ public interface UsersFeignClient {
 
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.pointcommons.tools.dto.BehaviorResultDto>
-     * @Description 更新用户信息
+     * @Description 更新用户积分信息
      * @Author songyunpeng
      * @Date 2020/4/29
      * @Param [dto]
      **/
-    @PutMapping(value = "app-user/user", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result updateUser(@RequestBody UserDTO dto);
+    @PostMapping(value = "app-user/user/updateUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result updateUserPoints(@RequestBody EpdcUserPointsFormDTO epdcUserPointsFormDTO);
 
     /**
      * @param formDTO
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
index 49c34cad..d62642f6 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
@@ -22,8 +22,8 @@ public class UsersFeignClientFallback implements UsersFeignClient {
     }
 
     @Override
-    public Result updateUser(UserDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "update", dto);
+    public Result updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateUserPoints", epdcUserPointsFormDTO);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java
index 11c1715e..9442548f 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java
@@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.form.PointsLogsAddFormDTO;
 import com.elink.esua.epdc.dto.form.PointsLogsFormDTO;
 import com.elink.esua.epdc.dto.result.PointsLogsResultDTO;
@@ -156,14 +157,17 @@ public class PointsModifyConsumer implements RocketMQListener<MessageExt> {
         }
         gridId = userLastSwitchGird.getData().getGridId();
         //2.更新用户积分分数
+        //3.更新数据库用户积分
+        EpdcUserPointsFormDTO epdcUserPointsFormDTO = new EpdcUserPointsFormDTO();
+        epdcUserPointsFormDTO.setUserId(userDTO.getId());
         if (OPERATION_TYPE_ADD.equals(pointsRuleResultDTO.getOperationType())) {
-            userDTO.setPoints(userDTO.getPoints() + pointsRuleResultDTO.getPoints());
-            userDTO.setPointsTotle(userDTO.getPointsTotle() == null ? 0 : userDTO.getPointsTotle() + pointsRuleResultDTO.getPoints());
+            epdcUserPointsFormDTO.setPoints(pointsRuleResultDTO.getPoints());
         } else if (OPERATION_TYPE_SUB.equals(pointsRuleResultDTO.getOperationType())) {
-            userDTO.setPoints(userDTO.getPoints() - pointsRuleResultDTO.getPoints());
+            epdcUserPointsFormDTO.setPoints(-pointsRuleResultDTO.getPoints());
         }
-        //3.更新数据库用户积分
-        usersFeignClient.updateUser(userDTO);
+        usersFeignClient.updateUserPoints(epdcUserPointsFormDTO);
+
+
         //4.更新redis用户积分情况
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDTO, TokenDto.class);
         tokenDto.setUserId(userDTO.getId());
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
index eb9a2081..23d27a2b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -324,4 +324,18 @@ public class UserController {
         return new Result<PageData<UserPointResultDTO>>().ok(page);
 
     }
+
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.pointcommons.tools.dto.BehaviorResultDto>
+     * @Description 更新用户积分信息
+     * @Author songyunpeng
+     * @Date 2020/4/29
+     * @Param [dto]
+     **/
+    @PostMapping(value = "updateUserPoints")
+    Result updateUserPoints(@RequestBody EpdcUserPointsFormDTO epdcUserPointsFormDTO){
+        return userService.updateUserPoints(epdcUserPointsFormDTO);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
index fc1b3cf7..ac4ff8a8 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@@ -289,4 +289,12 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @date 2020/8/3 13:43
      */
     List<UserPointResultDTO> selectListPoints(Map<String, Object> params);
+    /**
+     * @Description  更新用户积分
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [epdcUserPointsFormDTO]
+     * @return void
+     **/
+    void updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
index 68e43406..4525b58b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -393,5 +393,12 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2020/8/3 13:41
      */
     PageData<UserPointResultDTO> listPoint(Map<String, Object> params);
-
+    /**
+     * @Description  更新用户积分信息 
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [epdcUserPointsFormDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 73d3e5d2..35258ee4 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1357,4 +1357,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         List<UserPointResultDTO> userPointResultDTOS = baseDao.selectListPoints(params);
         return new PageData<>(userPointResultDTOS, iPage.getTotal());
     }
+
+    @Override
+    public Result updateUserPoints(EpdcUserPointsFormDTO epdcUserPointsFormDTO) {
+        baseDao.updateUserPoints(epdcUserPointsFormDTO);
+        return new Result();
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 6e0f87b6..cb7a8b33 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.dao.UserDao">
+    <update id="updateUserPoints">
+        update epdc_user set POINTS = POINTS + #{points}
+        <if test="points &lt; 0">
+            ,POINTS_TOTLE = POINTS_TOTLE + #{points}
+        </if>
+        where ID = #{userId}
+    </update>
 
     <delete id="deleteAuditFailureByOpenId">
         DELETE FROM epdc_user WHERE WX_OPEN_ID = #{wxOpenId} AND STATE = '2'

From 97d9421515eb1c6aba8958dfb47be36be03dae91 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 11 Dec 2020 17:48:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AB=AF=E5=88=B0?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=94=A8=E6=88=B7=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/SysUserController.java     | 11 +++++++++++
 .../esua/epdc/service/SysUserService.java      | 10 +++++++++-
 .../epdc/service/impl/SysUserServiceImpl.java  | 15 ++++++++++++++-
 .../controller/ApiAnalysisUserController.java  | 18 +++++++++++++++++-
 .../esua/epdc/feign/AdminFeignClient.java      | 10 ++++++++++
 .../fallback/AdminFeignClientFallback.java     |  6 +++++-
 .../elink/esua/epdc/service/AdminService.java  |  8 ++++++++
 .../epdc/service/impl/AdminServiceImpl.java    |  5 +++++
 8 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
index d19bf6d6..94793eb9 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
@@ -387,6 +387,17 @@ public class SysUserController {
         ValidatorUtils.validateEntity(epdcScripUserInfoFormDTO);
         return new Result<String>().ok(sysUserService.getUserInfoByGridAndMobile(epdcScripUserInfoFormDTO));
     }
+    /**
+     * @Description  根据ID获取临时凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [epdcScripUserInfoFormDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    @PostMapping("getScripBySysUserId/{id}")
+    public Result<String> getScripBySysUserId(@PathVariable Long id){
+        return new Result<String>().ok(sysUserService.getScripBySysUserId(id));
+    }
 
     /**
      * @Description  根据临时凭证获取用户信息
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
index e1ec23ab..74330003 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
@@ -120,7 +120,7 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      */
     Result<List<String>> getSysGridLeaderPhone(Long deptId);
     /**
-     * @Description  根据网格ID和手机号获取用户信息
+     * @Description  根据网格ID和手机号获取临时凭证
      * @Author songyunpeng
      * @Date  2020/6/22
      * @Param [epdcScripUserInfoFormDTO]
@@ -135,4 +135,12 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      * @return com.elink.esua.epdc.dto.SysUserDTO
      **/
     SysUserDTO getByScrip(String scrip);
+    /**
+     * @Description  根据ID获取临时凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [id]
+     * @return java.lang.String
+     **/
+    String getScripBySysUserId(Long id);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
index 9019c472..b7c49a1f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
@@ -26,7 +26,6 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SysUserDao;
 import com.elink.esua.epdc.dto.SysUserDTO;
-import com.elink.esua.epdc.dto.SysUserDeptDTO;
 import com.elink.esua.epdc.dto.SysUserDeptInfoDTO;
 import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
@@ -318,5 +317,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         return sysUserDTO;
     }
 
+    @Override
+    public String getScripBySysUserId(Long id) {
+        SysUserEntity sysUserEntity = baseDao.selectById(id);
+        if(sysUserEntity==null){
+            throw new RenException("未查询到相关账号信息");
+        }
+        String randomValue = String.valueOf((int)(Math.random()*(1000000-100000)+100000));
+        SysUserEntity userEntity = new SysUserEntity();
+        userEntity.setScrip(randomValue);
+        userEntity.setId(sysUserEntity.getId());
+        updateById(userEntity);
+        return randomValue;
+    }
+
 
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java
index 620011c7..e097f47e 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java
@@ -5,9 +5,11 @@ import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserScripLoginDTO;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
+import com.elink.esua.epdc.service.AdminService;
 import com.elink.esua.epdc.service.AnalysisUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,8 @@ public class ApiAnalysisUserController {
     @Autowired
     private AnalysisUserService analysisUserService;
 
-
+    @Autowired
+    private AdminService adminService;
     /**
      * 测试demo
 
@@ -51,6 +54,19 @@ public class ApiAnalysisUserController {
         ValidatorUtils.validateEntity(formDto);
         return analysisUserService.login(formDto);
     }
+
+    /**
+     * @Description   获取用户凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [userDetail]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    @PostMapping("getScrip")
+    public Result<String> getScrip(){
+        return adminService.getScripBySysUserId(SecurityUser.getUserId());
+    }
+
     /**
      * 数据分析端-用户凭证登录
      *
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index 3bb04b17..c1034109 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -146,6 +146,16 @@ public interface AdminFeignClient {
      **/
     @PostMapping(value = "sys/user/getUserInfoByGridAndMobile", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> getUserInfoByGridAndMobile(@RequestBody EpdcScripUserInfoFormDTO epdcScripUserInfoFormDTO);
+    /**
+     * @Description  根据用户ID获取用户临时凭证 
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    @PostMapping(value = "sys/user/getScripBySysUserId/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> getScripBySysUserId(@PathVariable Long id);
+
 
     /**
      * 获取字典信息
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index a0090c3b..88ef3145 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -10,7 +10,6 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -77,6 +76,11 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserInfoByGridAndMobile", epdcScripUserInfoFormDTO);
     }
 
+    @Override
+    public Result<String> getScripBySysUserId(Long id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getScripBySysUserId", id);
+    }
+
     @Override
     public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listFullDictInfo", dicType);
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index c8d94687..52674525 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -51,4 +51,12 @@ public interface AdminService {
      * @since 2020/10/12 9:35
      */
     Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType);
+    /**
+     * @Description  根据用户ID获取临时凭证
+     * @Author songyunpeng
+     * @Date  2020/12/11
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    Result<String> getScripBySysUserId(Long userId);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index d8906502..fff43a31 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -65,4 +65,9 @@ public class AdminServiceImpl implements AdminService {
     public Result<List<EpdcAppSysDictResultDTO>> listFullDictInfo(String dicType) {
         return adminFeignClient.listFullDictInfo(dicType);
     }
+
+    @Override
+    public Result<String> getScripBySysUserId(Long userId) {
+        return  adminFeignClient.getScripBySysUserId(userId);
+    }
 }