锦水优化代码提交

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;
     /**
      * 乐观锁
      */

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;
 }

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>

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());

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">

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

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

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());

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);
+    }
+
 }

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);
 }

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);
 }

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();
+    }
 }

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'