From 4f9214a48c57dfe65f5e09c3c14701537650bc9c Mon Sep 17 00:00:00 2001 From: zer0Black Date: Thu, 18 May 2023 16:31:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90review=E3=80=91=E8=AF=84=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/report/controller/ReportManageConroller.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 7f890e2..6267b2c 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -284,6 +284,7 @@ public class ReportManageConroller { return Result.success(); } + // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉 /** * 测试 */ @@ -294,6 +295,8 @@ public class ReportManageConroller { stringRedisTemplate.boundValueOps("1121212").set("1212"); } + + // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉 @ApiOperation("testPath") @GetMapping("/testPath") @Deprecated From a297980511dbbe165a24b83f66231818923a7bcc Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 18 May 2023 16:59:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E9=87=8D=E6=96=B0=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=90=8E=E4=B8=8D=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=99=BB=E9=99=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将新的sessionId返回给前端 --- .../com/adc/da/login/rest/LoginRestController.java | 14 ++++++++------ .../src/main/java/com/adc/da/sys/vo/UserVO.java | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java index ea81179..f599cf8 100644 --- a/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -350,7 +350,9 @@ public class LoginRestController { CacheUtils.putShiroSessionCache(userEO.getUsid(), session.getId()); } - return Result.success(beanMapper.map(returnEO, UserVO.class)); + ResponseMessage result = Result.success(beanMapper.map(returnEO, UserVO.class)); + result.getData().setSessionId(session.getId()); + return result; } catch (CaptchaException e) { log.info("验证码验证失败"); @@ -506,12 +508,12 @@ public class LoginRestController { @ResponseBody @ApiOperation(value = "SSO，根据Code返回用户信息") public ResponseMessage ssoLogin(String code, HttpServletRequest request){ -// if (StrUtil.isBlank(code)) { -// return Result.error("无法单点登录，code为空"); -// } -// String username = userService.ssoLogin(code); + if (StrUtil.isBlank(code)) { + return Result.error("无法单点登录，code为空"); + } + String username = userService.ssoLogin(code); - UsernamePasswordToken token = new UsernamePasswordToken("chh"); + UsernamePasswordToken token = new UsernamePasswordToken(username); return login(request, token); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java index 6c69d6f..7b4e4be 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java @@ -56,4 +56,6 @@ public class UserVO { private List orgEOList = new ArrayList(); private String employeeTypeId; + + private String sessionId; } From d1ae4c37e7cec274b33c69b62035fbaca64fb4cf Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 17:15:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E9=87=8D=E5=90=8D?= =?UTF-8?q?=E5=91=BD=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/report/controller/ReportManageConroller.java | 4 ++-- .../src/main/java/com/adc/da/report/vo/ReportVo.java | 2 ++ .../business_activiti/service/ActivitDefineService.java | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 7f890e2..3357d31 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -152,8 +152,8 @@ public class ReportManageConroller { if (count1 > 0){ return Result.error("报告名称已流程中存在"); } - //有报告id说明不是新增报告 走得不是新增流程 - if(StringUtils.isNotEmpty(vo.getId())){ + // 非新增流程 + if(!"4".equals(vo.getPrcType())){ long count2 = reportDao.selectByReportId(vo.getId()); if (count2==0){ return Result.error("报告已经不存在"); diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java index a9e1554..48cfc2a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java @@ -134,4 +134,6 @@ public class ReportVo { */ private Integer isAct; + private String prcType; + } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java index dacca21..611751d 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -19,10 +19,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; @Service public class ActivitDefineService { @@ -98,6 +95,7 @@ public class ActivitDefineService { //上传 TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); ttReportManageAct.setDataId(reportId); + ttReportManageAct.setReportId(reportId); ttReportManageAct.setTaskId(taskId); ttReportManageAct.setPrcId(prcId); ttReportManageAct.setDelFlag(0);