forked from gzzfw/backEnd/gz-dyh

liyj
2024-09-13 6cfbcfbae1acf55076ac163facfce462123a701d
Merge remote-tracking branch 'origin/master'
2 files added
5 files modified
68 ■■■■ changed files
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java 6 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridTokenVo.java 8 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRequestVo.java 9 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java 15 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java 22 ●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/resources/config/application.yml 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
@@ -30,10 +30,10 @@
    /**
     * 批量更新对象
     * @param caseTaskPO 对象
     * @param entity 对象
     * @param taskIdList
     */
    void updateCaseTaskList(@Param("caseTaskPO") CaseTask caseTaskPO, @Param("taskIdList") List<String> taskIdList);
    void updateCaseTaskList(@Param("entity") CaseTask entity, @Param("taskIdList") List<String> taskIdList);
    /**
    * 条件更新对象
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
@@ -1,6 +1,8 @@
package cn.huge.module.grid.controller;
import cn.huge.base.common.bo.R;
import cn.huge.module.grid.domain.vo.GridTokenVo;
import cn.huge.module.grid.domain.vo.GridUserRequestVo;
import cn.huge.module.grid.domain.vo.GridUserVo;
import cn.huge.module.grid.service.GridUserService;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +26,7 @@
     * @return
     */
    @PostMapping("/get-userinfo")
    public R<GridUserVo> getUserInfo(@RequestBody String token) {
        return gridUserService.getUserInfo(token);
    public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
        return gridUserService.getUserInfo(gridTokenVo);
    }
}
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridTokenVo.java
New file
@@ -0,0 +1,8 @@
package cn.huge.module.grid.domain.vo;
import lombok.Data;
@Data
public class GridTokenVo {
    private String token;
}
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRequestVo.java
New file
@@ -0,0 +1,9 @@
package cn.huge.module.grid.domain.vo;
import lombok.Data;
@Data
public class GridUserRequestVo {
    private HeadVo headVo;
    private GridTokenVo bodyVo;
}
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
@@ -19,7 +19,7 @@
    private String gridUrl = "http://219.137.166.84:8061";
    public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
        HeadVo headVo = iniHeadVo();
        HeadVo headVo = initHeadVo();
        GridToDoRequestVo requestVo = new GridToDoRequestVo();
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridToDoVo);
@@ -38,23 +38,26 @@
    }
    public R<GridToDoVo> updateToDo(GridToDoVo gridToDoVo) {
        HeadVo headVo = iniHeadVo();
        HeadVo headVo = initHeadVo();
        GridToDoRequestVo requestVo = new GridToDoRequestVo();
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridToDoVo);
        String s = null;
        log.info("xsd:{}", JSON.toJSONString(requestVo));
        log.info("xsd:{}",gridUrl + "/sysUserTodo/update");
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/update", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
        } catch (Exception e) {
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);
        }
        gridToDoVo = JSONObject.parseObject(s, GridToDoVo.class);
        log.info("xsd:{}", s);
        gridToDoVo = JSONObject.parseObject(s).getObject("data", GridToDoVo.class);
        return R.ok(gridToDoVo);
    }
    public R<String> deleteToDo(GridIdsVo gridIdsVo) {
        HeadVo headVo = iniHeadVo();
        HeadVo headVo = initHeadVo();
        GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridIdsVo);
@@ -77,7 +80,7 @@
    }
    public HeadVo iniHeadVo() {
    public HeadVo initHeadVo() {
        HeadVo headVo = new HeadVo();
        headVo.setUsername("mtxt001");
        headVo.setPassword("aek8CdcaM");
@@ -87,7 +90,7 @@
    }
    public R<List<GridToDoVo>> getToDo(GridGetToDoVo gridGetToDoVo) {
        HeadVo headVo = iniHeadVo();
        HeadVo headVo = initHeadVo();
        GridToDoGetRequestVo requestVo = new GridToDoGetRequestVo();
        gridGetToDoVo.setCurrent(1);
        gridGetToDoVo.setSize(10);
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -2,25 +2,30 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
import cn.huge.module.grid.domain.vo.GridUserVo;
import cn.huge.module.grid.domain.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.UUID;
@Slf4j
@Service
public class GridUserService {
    private String gridUrl = "http://219.137.166.84:8061";
    public R<GridUserVo> getUserInfo(String token) {
    public R<GridUserVo> getUserInfo(GridTokenVo gridTokenVo) {
        String s = null;
        HeadVo headVo = initHeadVo();
        GridUserRequestVo requestVo = new GridUserRequestVo();
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridTokenVo);
        try {
            log.info("xsd:{}",JSON.toJSONString(token));
            log.info("xsdobject:{}",JSON.toJSONString(requestVo));
            log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(token), new HashMap<>(), "utf-8");
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            log.info("xsd:{}",s);
        } catch (Exception e) {
            log.info("xsderror:{}",e.getLocalizedMessage());
@@ -29,4 +34,13 @@
        GridUserVo gridUserVo = JSONObject.parseObject(s).getObject("data", GridUserVo.class);
        return R.ok(gridUserVo);
    }
    public HeadVo initHeadVo() {
        HeadVo headVo = new HeadVo();
        headVo.setUsername("mtxt001");
        headVo.setPassword("aek8CdcaM");
        headVo.setRequestId(UUID.randomUUID().toString());
        headVo.setSource("string");
        return headVo;
    }
}
dyh-service/dyh-sys/src/main/resources/config/application.yml
@@ -2,8 +2,8 @@
spring:
  profiles:
    active:
      - dev
  #      - test
#      - dev
        - test
  #      - prod
  devtools: