Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-24 b5cf2539edf29b0da8bde02ad3b5c1c373824a34

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
#	ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

 ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java

@@ -2,6 +2,9 @@

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +32,7 @@
 */
@RestController
@RequestMapping("/task/text")
@Api(tags = "app浠诲姟鎻忚堪")
public class ArdAppTaskTextController extends BaseController
{
    @Autowired
@@ -39,6 +43,7 @@
     */
    @PreAuthorize("@ss.hasPermi('task:text:list')")
    @GetMapping("/list")
    @ApiOperation("鏌ヨapp浠诲姟鎻忚堪鍒楄〃")
    public TableDataInfo list(ArdAppTaskText ardAppTaskText)
    {
        startPage();

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -23,15 +23,12 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Constants;
import com.ruoyi.utils.result.Results;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.ListObjectsArgs;
import io.minio.PutObjectArgs;
import io.minio.Result;
import io.minio.http.Method;
import io.minio.messages.Contents;
import io.minio.messages.Item;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
@@ -371,11 +368,11 @@
            SysUser sysUser = userMapper.selectUserById(key);
            String deptId = String.valueOf(sysUser.getDeptId());
            Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
            System.out.println("/////////////");
            System.out.println(PositionContainer.getDeptPositionMap());
            Map<Integer,Object> data = new HashMap();
            data.put(30000, map.values());
            WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
            if(map != null){
                Map<Integer,Object> data = new HashMap();
                data.put(30000, map.values());
                WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
            }
        }
    }


 ard-work/src/main/java/com/ruoyi/utils/httpclient/SYCarClient.java

文件已删除