From dc6d6d4e303255284e013fb9ca5e29cfc2d963b3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 25 Oct 2022 14:56:57 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/item/result/ItemAppealPageResultDTO.java | 5 +++++ .../src/main/resources/mapper/item/ItemDao.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java index ba1399bac..e82a794b7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java @@ -125,4 +125,9 @@ public class ItemAppealPageResultDTO implements Serializable { */ private String remainTime; + /** + * 流程最新状态 + */ + private String processState; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index cba5b6ff9..2a4734dab 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1928,6 +1928,7 @@ when '2' then '非常满意' else '' end as evaluationScoreName, + process.state AS processState, i.EVALUATION_CONTENT, i.EVALUATION_TIME FROM epdc_item i From e18a0ab92a9170addc4c3e4bcd96d91cd89d313e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 25 Oct 2022 16:06:31 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B5=81=E7=A8=8BID=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index af6d366f4..0bf277bcf 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4136,7 +4136,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); } process.setItemId(item.getId()); - process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); + process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue()); process.setHandleAdvice(formDTO.getBhyy()); process.setOutHandleAdvice(formDTO.getBhyy()); process.setHandlerDept("青诉即办平台"); @@ -4159,7 +4159,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid()); } process.setItemId(item.getId()); - process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue()); + process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_FK.getValue()); process.setHandleAdvice(formDTO.getCljg()); process.setOutHandleAdvice(formDTO.getCljg()); process.setHandlerDept("青诉即办平台"); From ce68b585f25653ec90eec3e5383d8855b2bc544f Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 25 Oct 2022 16:45:15 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/AuthController.java | 25 +++++++++++-- .../com/elink/esua/epdc/dto/AutoLoginDTO.java | 37 +++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/dto/AutoLoginDTO.java diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java index 4a387f8b4..9c35b9fb7 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java @@ -8,6 +8,7 @@ package com.elink.esua.epdc.controller; +import cn.hutool.core.convert.Convert; import com.elink.esua.epdc.common.token.dto.*; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; @@ -16,10 +17,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.AuthorizationDTO; -import com.elink.esua.epdc.dto.LoginDTO; -import com.elink.esua.epdc.dto.SysUserAnalysisOpenIdFormDTO; -import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.service.AuthService; import com.elink.esua.epdc.service.CaptchaService; import com.elink.esua.epdc.service.ResourceService; @@ -87,6 +85,25 @@ public class AuthController { return new Result().ok(authorization); } + @PostMapping(value = "autologin") + @ApiOperation(value = "自动登录") + public Result autoLogin(@RequestBody AutoLoginDTO login) { + //效验数据 + ValidatorUtils.validateEntity(login); + + // 特定账号才可以免登录 + boolean flag = "screen".equals(login.getUsername()); + if (!flag) { + return new Result().error(ErrorCode.FORBIDDEN); + } + + LoginDTO loginDTO = ConvertUtils.sourceToTarget(login, LoginDTO.class); + //获取登录授权信息 + AuthorizationDTO authorization = authService.login(loginDTO); + + return new Result().ok(authorization); + } + /** * * 工作端-获取token diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/dto/AutoLoginDTO.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/dto/AutoLoginDTO.java new file mode 100644 index 000000000..0eefee790 --- /dev/null +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/dto/AutoLoginDTO.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 登录信息 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@ApiModel(value = "登录信息") +public class AutoLoginDTO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "用户名", required = true) + @NotBlank(message="{sysuser.username.require}") + private String username; + + @ApiModelProperty(value = "密码") + @NotBlank(message="{sysuser.password.require}") + private String password; + +} From 9c274334ea3a4da615590ed3d51685121fdb69da Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 25 Oct 2022 16:46:06 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AF=89=E6=B1=82=E5=88=9D=E9=AA=8C?= =?UTF-8?q?=E5=92=8C=E8=AF=89=E6=B1=82=E7=BB=88=E9=AA=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 7ce374fab..0c6651946 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4452,6 +4452,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue()); itemHandleProcessService.insert(handleProcessEntity); + // 删除已流转协助部门 + itemDeptService.modifyItemDepts(deptId, formDTO.getId()); + // 新增流转协助部门 + ItemHandleSubmitFormDTO dto = ConvertUtils.sourceToTarget(formDTO, ItemHandleSubmitFormDTO.class); + itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); + //上报市平台 pushToCityGridService.earlyInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class)); } else { From 2fc2189376b69d10ca3d37137fec3b19b5ff062a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 25 Oct 2022 17:01:37 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=BC=A0=E5=80=9F=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/controller/AuthController.java | 2 +- esua-epdc/epdc-cloud-commons-shibei | 2 +- esua-epdc/epdc-cloud-gateway-shibei | 2 +- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java index 9c35b9fb7..867d61942 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java @@ -96,7 +96,7 @@ public class AuthController { if (!flag) { return new Result().error(ErrorCode.FORBIDDEN); } - + login.setPassword("123"); LoginDTO loginDTO = ConvertUtils.sourceToTarget(login, LoginDTO.class); //获取登录授权信息 AuthorizationDTO authorization = authService.login(loginDTO); diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 89bb48135..ea7a11ae1 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 89bb48135eb0db7b1682b1e7d51b0bd5c8d02a0f +Subproject commit ea7a11ae181a0b6b82775a6b7e859b4dbb3e550b diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 4a4caf14c..93f353e1a 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 4a4caf14c35de0d4678fd94d141da3661b549c1e +Subproject commit 93f353e1aed743c80b0c66938c0af142a806ef5b diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ab7644ba5..96f164a4a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4666,7 +4666,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } - @Transactional(rollbackFor = Exception.class) public ItemHandleProcessDTO closedItem(AcceptPlantformProcessDTO formDto) { String successFlag = YesOrNoEnum.NO.value(); From fc1d3bd26b0845182b50416571dafb2bdd74e9b4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Oct 2022 17:46:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9C=8D=E6=B0=94=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index b4b68accb..91d14e8d8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -398,6 +398,7 @@ + From 70c14687ef92a66ddc70a9bb21138dd42081fbf1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 25 Oct 2022 18:05:14 +0800 Subject: [PATCH 7/8] 889889 --- esua-epdc/epdc-cloud-gateway-shibei | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 93f353e1a..fa2c20005 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 93f353e1aed743c80b0c66938c0af142a806ef5b +Subproject commit fa2c20005c4b52aa606b2433c38ce51d3111ff9e From bfee3f0f8735df31efc36efbd712d34ebc3f75ce Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 25 Oct 2022 18:19:45 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=AF=89=E6=B1=82=E5=88=9D=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/service/impl/ItemServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 96f164a4a..6825c4ec9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -4451,11 +4451,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem //保存处理节点 handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue()); itemHandleProcessService.insert(handleProcessEntity); - // 删除已流转协助部门 itemDeptService.modifyItemDepts(deptId, formDTO.getId()); // 新增流转协助部门 ItemHandleSubmitFormDTO dto = ConvertUtils.sourceToTarget(formDTO, ItemHandleSubmitFormDTO.class); + // 手动拼接流转协助部门 + ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); + itemCirculationDeptResultDTO.setDeptId(dept.getData().getPid()); + itemCirculationDeptResultDTO.setDeptName(dept.getData().getParentName()); + itemCirculationDeptResultDTO.setSelected(false); + itemCirculationDeptResultDTO.setTypeKey(dept.getData().getTypeKey()); + List deptList = new ArrayList<>(); + deptList.add(itemCirculationDeptResultDTO); + dto.setDeptResultDTOS(deptList); itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); //上报市平台