Merge remote-tracking branch 'origin/master'

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/WorkWechatRoomDTO.java

@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class WorkWechatRoomDTO {
 
+    private String uuid;
+
     private String roomId;
 
     private String roomName;

risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/WorkWechatServiceImpl.java

@@ -20,7 +20,7 @@ import com.tzld.piaoquan.risk.control.util.HttpClientUtil;
 import com.tzld.piaoquan.risk.control.util.HttpPoolClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -88,6 +88,7 @@ public class WorkWechatServiceImpl implements WorkWechatService {
             String roomId = room.getString("room_id");
 
             WorkWechatRoomDTO workWechatRoomDTO = new WorkWechatRoomDTO();
+            workWechatRoomDTO.setUuid(uuid);
             workWechatRoomDTO.setRoomId(roomId);
             workWechatRoomDTO.setRoomName(room.getString("nickname"));
             workWechatRoomDTO.setAutoRemoveUserSwitch(roomAutoRemoveUserStatusMap.getOrDefault(roomId, 0));
@@ -120,22 +121,28 @@ public class WorkWechatServiceImpl implements WorkWechatService {
     @Override
     public void updateAutoRemoveUserStatus(WorkWechatRoomDTO param) {
 
-        if (StringUtils.isBlank(param.getRoomId()) || Objects.isNull(param.getAutoRemoveUserSwitch())) {
+        if (StringUtils.isAnyBlank(param.getRoomId(), param.getUuid()) || Objects.isNull(param.getAutoRemoveUserSwitch())) {
             throw new CommonException(ExceptionEnum.PARAMS_INVALID);
         }
 
+        Long userId = LoginUserContext.getUserId();
+
         WorkWechatRoomInfoExample example = new WorkWechatRoomInfoExample();
         example.createCriteria().andRoomIdEqualTo(param.getRoomId());
         List<WorkWechatRoomInfo> workWechatRoomInfos = workWechatRoomInfoMapper.selectByExample(example);
         if (CollectionUtils.isNotEmpty(workWechatRoomInfos)) {
             WorkWechatRoomInfo workWechatRoomInfo = workWechatRoomInfos.get(0);
             workWechatRoomInfo.setAutoRemoveUserSwitch(param.getAutoRemoveUserSwitch());
+            workWechatRoomInfo.setUpdateUser(userId);
             workWechatRoomInfoMapper.updateByPrimaryKeySelective(workWechatRoomInfo);
         } else {
             WorkWechatRoomInfo workWechatRoomInfo = new WorkWechatRoomInfo();
+            workWechatRoomInfo.setUuid(param.getUuid());
             workWechatRoomInfo.setRoomId(param.getRoomId());
+            workWechatRoomInfo.setCreateUser(userId);
+            workWechatRoomInfo.setUpdateUser(userId);
             workWechatRoomInfo.setAutoRemoveUserSwitch(param.getAutoRemoveUserSwitch());
-            workWechatRoomInfoMapper.updateByPrimaryKeySelective(workWechatRoomInfo);
+            workWechatRoomInfoMapper.insertSelective(workWechatRoomInfo);
         }
     }