网关日志限制修改

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralRuleBiz.java

@@ -103,10 +103,10 @@ public class IntegralRuleBiz extends BaseBiz<IntegralRuleMapper, IntegralRule> {
 
 
     public void  getIntegralStatus(AppUserDTO appUserDTO, IntegralRule integralRule) {
-        IntegralUserStatus integralUserStatus1 = integralUserStatusBiz.selectByUserAndCode(integralRule.getCode(), appUserDTO.getUserid());
-        if(integralUserStatus1 != null) {
-            integralRule.setIntegralStatus(integralUserStatus1.getIntegralStatus());
-        }
+            List<IntegralUserStatus> oldValue = integralUserStatusBiz.selectByUserAndCode(integralRule.getCode(), appUserDTO.getUserid());
+            if(oldValue != null && oldValue.size() > 0) {
+                integralRule.setIntegralStatus(oldValue.get(0).getIntegralStatus());
+            }
     }
 
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralUserStatusBiz.java

@@ -6,12 +6,13 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.entity.IntegralUserStatus;
 import com.xxfc.platform.activity.mapper.IntegralUserStatusMapper;
+import com.xxfc.platform.activity.util.IntegralToolsUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.TimeZone;
+import java.util.List;
 
 @Service
 @Transactional
@@ -20,26 +21,25 @@ public class IntegralUserStatusBiz extends BaseBiz<IntegralUserStatusMapper, Int
 
     public ObjectRestResponse save(IntegralUserStatus integralUserStatus) {
         if(integralUserStatus != null) {
-            IntegralUserStatus oldValue = mapper.selectByUserAndCode(integralUserStatus);
-            if(oldValue != null) {
-                BeanUtil.copyProperties(integralUserStatus, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-                updateSelectiveById(oldValue);
+            List<IntegralUserStatus> oldValue = selectByUserAndCode(integralUserStatus.getIntegralRuleCode(), integralUserStatus.getUserId());
+            if(oldValue != null && oldValue.size() > 0) {
+                BeanUtil.copyProperties(integralUserStatus, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                updateSelectiveById(oldValue.get(0));
             }
             insertSelective(integralUserStatus);
         }
         return ObjectRestResponse.succ();
     }
 
-    public IntegralUserStatus selectByUserAndCode(String code, Integer userId) {
+    public List<IntegralUserStatus> selectByUserAndCode(String code, Integer userId) {
         if(!StringUtils.isAllBlank(code, userId + "")) {
-            long current = System.currentTimeMillis();
-            long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
-
             IntegralUserStatus integralUserStatus = new IntegralUserStatus();
             integralUserStatus.setIntegralRuleCode(code);
             integralUserStatus.setUserId(userId);
-            integralUserStatus.setStartTime(startTime);
-            integralUserStatus.setEndTime(startTime  + 24 * 60 * 60 * 1000 - 1);
+            if(!"REGISTER".equals(code) && !"CRETIFICATION".equals(code) && !"BINDWECHAT".equals(code)) {
+                integralUserStatus.setStartTime(IntegralToolsUtils.getDayStart());
+                integralUserStatus.setEndTime(IntegralToolsUtils.getDayStart() + 24 * 60 * 60 * 1000);
+            }
             log.info("获取用户积分状态：" + integralUserStatus.toString());
             return mapper.selectByUserAndCode(integralUserStatus);
         }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/IntegralUserStatusMapper.java

@@ -3,8 +3,9 @@ package com.xxfc.platform.activity.mapper;
 import com.xxfc.platform.activity.entity.IntegralUserStatus;
 import tk.mybatis.mapper.common.Mapper;
 
-public interface IntegralUserStatusMapper extends Mapper<IntegralUserStatus> {
+import java.util.List;
 
-    IntegralUserStatus selectByUserAndCode(IntegralUserStatus integralUserStatus);
+public interface IntegralUserStatusMapper extends Mapper<IntegralUserStatus> {
 
+    List<IntegralUserStatus> selectByUserAndCode(IntegralUserStatus integralUserStatus);
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/IntegralSignRecordMapper.xml

@@ -12,7 +12,7 @@
     <result column="last_time" property="lastTime" jdbcType="BIGINT" />
   </resultMap>
 
-    <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.activity.entity.IntegralSignRecord">
+    <select id="Id" parameterType="java.lang.Integer" resultType="com.xxfc.platform.activity.entity.IntegralSignRecord">
       select * from integral_sign_record
       where user_id = #{userId} and isdel = 0
       order by last_time

xx-activity/xx-activity-server/src/main/resources/mapper/IntegralUserStatusMapper.xml

@@ -10,7 +10,10 @@
 
     <select id="selectByUserAndCode" resultType="com.xxfc.platform.activity.entity.IntegralUserStatus" parameterType="com.xxfc.platform.activity.entity.IntegralUserStatus">
       select * from integral_user_status
-      where integral_rule_code = #{integralRuleCode} and user_id = #{userId}
-      and crt_time between #{startTime} and #{endTime} and integral_status =1
+      where integral_rule_code = #{integralRuleCode} and user_id = #{userId} and integral_status =1
+        <if test="startTime != null">
+          and crt_time between #{startTime} and #{endTime}
+        </if>
+      order by upd_time DESC
     </select>
 </mapper>
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -5,14 +5,18 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.mongodb.client.result.UpdateResult;
 import com.xxfc.platform.im.model.User;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -112,6 +116,22 @@ public class UserBiz {
         return  json.toJSONString();
     }
 
+    public ObjectRestResponse updateUserInfo(String nickname) {
+        AppUserDTO appUserDTO = getUserInfo();
+        if(appUserDTO == null) {
+            return ObjectRestResponse.createFailedResult(500, "token失效");
+        }
+        if(StringUtils.isBlank(nickname)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        String phone = appUserDTO.getUsername();
+        Query query = new Query(Criteria.where("phone").is(phone));
+
+        Update update = Update.update("nickname",nickname);
+       UpdateResult updateResult = mongoTemplate.updateFirst(query, update, Map.class,"user");
+       return ObjectRestResponse.succ(updateResult);
+    }
+
     /**
      * 远程请求
      * @param path

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/UserController.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.im.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.im.biz.UserBiz;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,4 +43,9 @@ public class UserController {
         baseResponse.setMessage(result);
         return baseResponse;
     }
+    @PostMapping(value = "/update")
+    public ObjectRestResponse updateUserInfo(String nickname) {
+        return mtBiz.updateUserInfo(nickname);
+    }
+
 }