From 9eeae8b2dbafc9b06bca7c5ffa79af97a94e7dbf Mon Sep 17 00:00:00 2001 From: yujintao Date: Thu, 5 Dec 2019 09:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4events=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=BA=9F=E5=BC=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/log/DeptRespondLogDTO.java | 96 ------------ .../esua/epdc/dto/rule/DeptKpiConfigDTO.java | 86 ----------- .../dto/time/DeptRespondTimeConfigDTO.java | 127 ---------------- .../esua/epdc/enums/DeptKpiConfigEnum.java | 58 -------- .../esua/epdc/enums/DeptRespondTypeEnum.java | 88 ----------- .../epdc/modules/async/DeptRespondTask.java | 138 ------------------ .../controller/DeptRespondLogController.java | 94 ------------ .../modules/log/dao/DeptRespondLogDao.java | 33 ----- .../log/entity/DeptRespondLogEntity.java | 66 --------- .../log/excel/DeptRespondLogExcel.java | 71 --------- .../log/redis/DeptRespondLogRedis.java | 47 ------ .../log/service/DeptRespondLogService.java | 95 ------------ .../impl/DeptRespondLogServiceImpl.java | 104 ------------- .../controller/DeptKpiConfigController.java | 94 ------------ .../modules/rule/dao/DeptKpiConfigDao.java | 33 ----- .../rule/entity/DeptKpiConfigEntity.java | 56 ------- .../rule/excel/DeptKpiConfigExcel.java | 65 --------- .../rule/redis/DeptKpiConfigRedis.java | 47 ------ .../rule/service/DeptKpiConfigService.java | 95 ------------ .../impl/DeptKpiConfigServiceImpl.java | 104 ------------- .../DeptRespondTimeConfigController.java | 94 ------------ .../time/dao/DeptRespondTimeConfigDao.java | 33 ----- .../entity/DeptRespondTimeConfigEntity.java | 97 ------------ .../excel/DeptRespondTimeConfigExcel.java | 90 ------------ .../redis/DeptRespondTimeConfigRedis.java | 47 ------ .../service/DeptRespondTimeConfigService.java | 95 ------------ .../DeptRespondTimeConfigServiceImpl.java | 104 ------------- .../mapper/log/DeptRespondLogDao.xml | 22 --- .../mapper/rule/DeptKpiConfigDao.xml | 20 --- .../mapper/tiime/DeptRespondTimeConfigDao.xml | 28 ---- 30 files changed, 2227 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/log/DeptRespondLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rule/DeptKpiConfigDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/time/DeptRespondTimeConfigDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptKpiConfigEnum.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptRespondTypeEnum.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/DeptRespondTask.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/controller/DeptRespondLogController.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/dao/DeptRespondLogDao.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/entity/DeptRespondLogEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/excel/DeptRespondLogExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/redis/DeptRespondLogRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/DeptRespondLogService.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/impl/DeptRespondLogServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/controller/DeptKpiConfigController.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/dao/DeptKpiConfigDao.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/entity/DeptKpiConfigEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/excel/DeptKpiConfigExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/redis/DeptKpiConfigRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/DeptKpiConfigService.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/DeptKpiConfigServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/controller/DeptRespondTimeConfigController.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/dao/DeptRespondTimeConfigDao.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/entity/DeptRespondTimeConfigEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/excel/DeptRespondTimeConfigExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/redis/DeptRespondTimeConfigRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/DeptRespondTimeConfigService.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/impl/DeptRespondTimeConfigServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/log/DeptRespondLogDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rule/DeptKpiConfigDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/tiime/DeptRespondTimeConfigDao.xml diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/log/DeptRespondLogDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/log/DeptRespondLogDTO.java deleted file mode 100644 index 82a1edd0c..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/log/DeptRespondLogDTO.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.log; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@Data -public class DeptRespondLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 引用ID - */ - private String referenceId; - - /** - * 引用类型 issue或item - */ - private String referenceType; - - /** - * 响应部门的id（被呼叫的部门即审核部门） - */ - private Long respondDeptId; - - /** - * 响应时间即审核时间 - */ - private Date respondTime; - - /** - * 响应类型，参考枚举类DeptRespondTypeEnum - */ - private Integer respondType; - - /** - * 删除标识 0：未删除，1：删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rule/DeptKpiConfigDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rule/DeptKpiConfigDTO.java deleted file mode 100644 index 5212e70e1..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rule/DeptKpiConfigDTO.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.rule; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@Data -public class DeptKpiConfigDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 绩效指标编码 - */ - private String kpiItemCode; - - /** - * 绩效指标值 - */ - private Integer kpiItemValue; - - /** - * 绩效指标描述 - */ - private String kpiItemDesc; - - /** - * 删除标识 0：未删除，1：删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/time/DeptRespondTimeConfigDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/time/DeptRespondTimeConfigDTO.java deleted file mode 100644 index 7440d1cb8..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/time/DeptRespondTimeConfigDTO.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.time; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@Data -public class DeptRespondTimeConfigDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - private String id; - - /** - * 议题或项目类别ID(不可重复) - */ - private String categoryId; - - /** - * 类别名称 - */ - private String categoryName; - - /** - * 网格长在多少小时内响应算是有效响应 - */ - private Integer gridValidRespLimitHour; - - /** - * 网格长在多少小时内关闭算是有效关闭 - */ - private Integer gridValidCloseLimitHour; - - /** - * 社区在多少小时内响应算是有效响应 - */ - private Integer commValidRespLimitHour; - - /** - * 街道在多少小时内响应算是有效响应 - */ - private Integer streetValidRespLimitHour; - - /** - * 区直在多少小时内响应算是有效响应 - */ - private Integer districtValidRespLimitHour; - - /** - * 超过多少小时响应算是无效响应。此值应大于各部门的有效响应值。若响应发生在有效响应与无效响应之间，为超时响应。 - */ - private Integer invalidRespLimitHour; - - /** - * 有效响应系数 - */ - private BigDecimal validRespCoefficient; - - /** - * 超时响应系数 - */ - private BigDecimal overtimeRespCoefficient; - - /** - * 无效响应系数 - */ - private BigDecimal invalidRespCoefficient; - - /** - * 删除标识 0：未删除，1：删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptKpiConfigEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptKpiConfigEnum.java deleted file mode 100644 index d27fb7316..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptKpiConfigEnum.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.elink.esua.epdc.enums; - -/** - * 部门绩效考核项枚举 - * - * @author work@yujt.net.cn - * @date 2019/10/21 14:28 - */ -public enum DeptKpiConfigEnum { - - /** - * 选用单词：Grid(网格) Work(工作) Score(得分) Percent(百分比) - */ - G_WSP("G_WSP", "履行抓基层党建工作职责得分占比(%)"), - /** - * 选用单词：People(人们) Satisfied(满意) Percent(百分比) - */ - P_SP("P_SP", "群众满意度得分占比(%)"), - /** - * 选用单词：Grid(网格) Respond(响应) - */ - G_R("G_R", "群众反应问题网格响应率得分"), - /** - * 选用单词：Grid(网格) Satisfied(满意) - */ - G_S("G_S", "群众反应问题网格满意率得分"), - /** - * 选用单词：District(地区) Street(街道) Respond(响应) - */ - DS_R("DS_R", "(区直/街道)网格呼叫事项响应率得分"), - /** - * 选用单词：District(地区) Street(街道) Complete(完成) - */ - DS_C("DS_C", "(区直/街道)网格呼叫事项办结率得分"), - /** - * 选用单词：District(地区) Street(街道) Satisfied(满意) - */ - DS_S("DS_S", "(区直/街道)网格工作评议得分"); - - - private String code; - - private String desc; - - - DeptKpiConfigEnum(String code, String desc) { - this.code = code; - this.desc = desc; - } - - public String getCode() { - return code; - } - - public String getDesc() { - return desc; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptRespondTypeEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptRespondTypeEnum.java deleted file mode 100644 index e6569d443..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/DeptRespondTypeEnum.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.elink.esua.epdc.enums; - - -import com.elink.esua.epdc.constant.EventIssueItemState; - -/** - * 部门响应类型枚举 - * - * @author work@yujt.net.cn - * @date 2019/10/21 09:52 - */ -public enum DeptRespondTypeEnum { - - /** - * 项目：处理 - */ - ITEM_I_HANDLE(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue(), ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName()), - /** - * 项目：流转协助 - */ - ITEM_CIRCULATION_ASSISTANCE(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue(), ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getName()), - /** - * 项目：关闭 - */ - ITEM_HANDLED_CLOSE(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue(), ItemHandleCategoryEnum.HANDLE_CLOSE.getName()), - /** - * 项目：结案 - */ - ITEM_HANDLED_END(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue(), ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getName()), - - - //------------------------------------- - - /** - * 事件-驳回 - */ - EVENT_REVIEW_REJECT(EventIssueItemState.EVENT_REVIEW_REJECT,"事件驳回"), - - //----------------------------------------------------------- - /** - * 议题：审核通过 成为议题 - */ - ISSUE_HANDLED_PASS(EventIssueItemState.ISSUE_HANDLED_PASS, "审核通过"), - /** - * 议题：议题-已转项目 - */ - ISSUE_CHANGE_TO_ITEM(EventIssueItemState.ISSUE_CHANGE_TO_ITEM, "审核通过"), - /** - * 议题：反馈 - */ - ISSUE_HANDLED_FEEDBACK(EventIssueItemState.ISSUE_HANDLED_FEEDBACK, "反馈"), - /** - * 议题：关闭 - */ - ISSUE_CLOSED(EventIssueItemState.ISSUE_CLOSED, "关闭"), - - - //------------------------------------- - - - /** - * 被抢占响应（还未响应时，议题或项目已被关闭或结案） - */ - RESPONSE_BE_ROBBED(-1, "被抢占响应"), - - /** - * 超时响应 - */ - RESPONSE_TIMED_OUT(-2, "超时响应"); - - private int value; - private String desc; - - DeptRespondTypeEnum(int value, String desc) { - this.value = value; - this.desc = desc; - } - - - public int getValue() { - return value; - } - - public String getDesc() { - return desc; - } - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/DeptRespondTask.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/DeptRespondTask.java deleted file mode 100644 index 7dd9776e8..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/async/DeptRespondTask.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.elink.esua.epdc.modules.async; - -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.security.user.UserDetail; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.constant.EventIssueItemState; -import com.elink.esua.epdc.constant.EventsNoticeConstant; -import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; -import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; -import com.elink.esua.epdc.dto.log.DeptRespondLogDTO; -import com.elink.esua.epdc.enums.DeptRespondTypeEnum; -import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; -import com.elink.esua.epdc.enums.ReferenceTypeEnum; -import com.elink.esua.epdc.modules.issue.service.IssueService; -import com.elink.esua.epdc.modules.log.entity.DeptRespondLogEntity; -import com.elink.esua.epdc.modules.log.service.DeptRespondLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.util.Date; - -/** - * @author: qushutong - * @Date: 2019/10/22 14:22 - * @Description: 响应log日志 - */ -@Component -public class DeptRespondTask { - - @Autowired - private DeptRespondLogService deptRespondLogService; - - /*** - * 转议题插入部门响应记录 4-事件-审核通过 2-事件-驳回 - * @param dto - * @return void - * @author qushutong - * @date 2019/10/22 11:06 - */ - @Async - public void saveEventDeptRespond(EpdcEventsReviewFormDTO dto) { - //待审核 则不插入 - if (EventIssueItemState.EVENT_PENDING_REVIEW == dto.getEventState()) { - return; - } - //组装插入数据 - DeptRespondLogEntity entity = new DeptRespondLogEntity(); - UserDetail user = SecurityUser.getUser(); - entity.setReferenceId(dto.getId()); - entity.setReferenceType(ReferenceTypeEnum.EVENT.getName()); - entity.setRespondDeptId(user.getDeptId()); - entity.setRespondTime(new Date()); - //审核通过 - if (EventIssueItemState.EVENT_REVIEW_PASS == dto.getEventState()) { - entity.setRespondType(DeptRespondTypeEnum.ISSUE_HANDLED_PASS.getValue()); - }//驳回 - else if (EventIssueItemState.EVENT_REVIEW_REJECT == dto.getEventState()) { - entity.setRespondType(DeptRespondTypeEnum.EVENT_REVIEW_REJECT.getValue()); - } - DeptRespondLogDTO deptRespondLogDTO = ConvertUtils.sourceToTarget(entity, DeptRespondLogDTO.class); - deptRespondLogService.save(deptRespondLogDTO); - } - - /*** - * 议事处理审核/关闭 1-反馈，2-关闭，4-已转项目 不是这三种状态不作响应 - * @param dto - * @return void - * @author qushutong - * @date 2019/10/22 14:51 - */ - @Async - public void saveIssueDeptRespond(IssueWaitHandleSubmitFormDTO dto) { - //1-反馈，2-关闭，4-已转项目 不是这三种状态不作响应 - if (EventIssueItemState.ISSUE_CLOSED != dto.getState() || EventIssueItemState.ISSUE_HANDLED_FEEDBACK != dto.getState() || EventIssueItemState.ISSUE_CHANGE_TO_ITEM != dto.getState()) { - return; - } - //组装插入数据 - DeptRespondLogEntity entity = new DeptRespondLogEntity(); - UserDetail user = SecurityUser.getUser(); - entity.setReferenceId(dto.getId()); - entity.setReferenceType(ReferenceTypeEnum.ISSUE.getName()); - entity.setRespondDeptId(user.getDeptId()); - entity.setRespondTime(new Date()); - //议题关闭 1-反馈，2-关闭，4-已转项目 - if (EventIssueItemState.ISSUE_CLOSED == dto.getState()) { - entity.setRespondType(DeptRespondTypeEnum.ISSUE_CLOSED.getValue()); - } - //议题审核 - else if (EventIssueItemState.ISSUE_HANDLED_FEEDBACK == dto.getState()) { - entity.setRespondType(DeptRespondTypeEnum.ISSUE_HANDLED_FEEDBACK.getValue()); - } - //已转项目 - else if (EventIssueItemState.ISSUE_CHANGE_TO_ITEM == dto.getState()) { - entity.setRespondType(DeptRespondTypeEnum.ISSUE_CHANGE_TO_ITEM.getValue()); - } - DeptRespondLogDTO deptRespondLogDTO = ConvertUtils.sourceToTarget(entity, DeptRespondLogDTO.class); - deptRespondLogService.save(deptRespondLogDTO); - } - - - /*** - * 项目 处理方式：0 处理，1 流转协助，5 关闭，10 结案 - * @param dto - * @return void - * @author qushutong - * @date 2019/10/22 16:03 - */ - @Async - public void saveItemDeptRespond(ItemHandleSubmitFormDTO dto) { - //组装插入数据 - DeptRespondLogEntity entity = new DeptRespondLogEntity(); - UserDetail user = SecurityUser.getUser(); - entity.setReferenceId(dto.getId()); - entity.setReferenceType(ReferenceTypeEnum.ITEM.getName()); - entity.setRespondDeptId(user.getDeptId()); - entity.setRespondTime(new Date()); - //流转 - if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { - entity.setRespondType(DeptRespondTypeEnum.ITEM_CIRCULATION_ASSISTANCE.getValue()); - } - //关闭 - else if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory()) { - entity.setRespondType(DeptRespondTypeEnum.ITEM_HANDLED_CLOSE.getValue()); - } - //结案 - else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { - entity.setRespondType(DeptRespondTypeEnum.ITEM_HANDLED_END.getValue()); - } - //处理 - else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { - entity.setRespondType(DeptRespondTypeEnum.ITEM_I_HANDLE.getValue()); - } - DeptRespondLogDTO deptRespondLogDTO = ConvertUtils.sourceToTarget(entity, DeptRespondLogDTO.class); - deptRespondLogService.save(deptRespondLogDTO); - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/controller/DeptRespondLogController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/controller/DeptRespondLogController.java deleted file mode 100644 index b8cc0bcfe..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/controller/DeptRespondLogController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -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.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.log.DeptRespondLogDTO; -import com.elink.esua.epdc.modules.log.excel.DeptRespondLogExcel; -import com.elink.esua.epdc.modules.log.service.DeptRespondLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@RestController -@RequestMapping("deptrespondlog") -public class DeptRespondLogController { - - @Autowired - private DeptRespondLogService deptRespondLogService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = deptRespondLogService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - DeptRespondLogDTO data = deptRespondLogService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody DeptRespondLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - deptRespondLogService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody DeptRespondLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - deptRespondLogService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - deptRespondLogService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = deptRespondLogService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, DeptRespondLogExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/dao/DeptRespondLogDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/dao/DeptRespondLogDao.java deleted file mode 100644 index 17bbfc82f..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/dao/DeptRespondLogDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.log.entity.DeptRespondLogEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@Mapper -public interface DeptRespondLogDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/entity/DeptRespondLogEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/entity/DeptRespondLogEntity.java deleted file mode 100644 index 67fd80106..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/entity/DeptRespondLogEntity.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_dept_respond_log") -public class DeptRespondLogEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 引用ID - */ - private String referenceId; - - /** - * 引用类型 issue或item - */ - private String referenceType; - - /** - * 响应部门的id（被呼叫的部门即审核部门） - */ - private Long respondDeptId; - - /** - * 响应时间即审核时间 - */ - private Date respondTime; - - /** - * 响应类型，参考枚举类DeptRespondTypeEnum - */ - private Integer respondType; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/excel/DeptRespondLogExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/excel/DeptRespondLogExcel.java deleted file mode 100644 index 12e31f896..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/excel/DeptRespondLogExcel.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@Data -public class DeptRespondLogExcel { - - @Excel(name = "ID") - private String id; - - @Excel(name = "引用ID") - private String referenceId; - - @Excel(name = "引用类型 issue或item") - private String referenceType; - - @Excel(name = "响应部门的id（被呼叫的部门即审核部门）") - private Long respondDeptId; - - @Excel(name = "响应时间即审核时间") - private Date respondTime; - - @Excel(name = "响应类型，参考枚举类DeptRespondTypeEnum") - private Integer respondType; - - @Excel(name = "删除标识 0：未删除，1：删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/redis/DeptRespondLogRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/redis/DeptRespondLogRedis.java deleted file mode 100644 index e186849fb..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/redis/DeptRespondLogRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@Component -public class DeptRespondLogRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/DeptRespondLogService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/DeptRespondLogService.java deleted file mode 100644 index 5c62038bf..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/DeptRespondLogService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.log.DeptRespondLogDTO; -import com.elink.esua.epdc.modules.log.entity.DeptRespondLogEntity; - -import java.util.List; -import java.util.Map; - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -public interface DeptRespondLogService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-10-22 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-10-22 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return DeptRespondLogDTO - * @author generator - * @date 2019-10-22 - */ - DeptRespondLogDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-10-22 - */ - void save(DeptRespondLogDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-10-22 - */ - void update(DeptRespondLogDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-10-22 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/impl/DeptRespondLogServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/impl/DeptRespondLogServiceImpl.java deleted file mode 100644 index d8f3c4afa..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/log/service/impl/DeptRespondLogServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.log.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.log.dao.DeptRespondLogDao; -import com.elink.esua.epdc.dto.log.DeptRespondLogDTO; -import com.elink.esua.epdc.modules.log.entity.DeptRespondLogEntity; -import com.elink.esua.epdc.modules.log.redis.DeptRespondLogRedis; -import com.elink.esua.epdc.modules.log.service.DeptRespondLogService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 部门响应记录 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-22 - */ -@Service -public class DeptRespondLogServiceImpl extends BaseServiceImpl implements DeptRespondLogService { - - @Autowired - private DeptRespondLogRedis deptRespondLogRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, DeptRespondLogDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, DeptRespondLogDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public DeptRespondLogDTO get(String id) { - DeptRespondLogEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, DeptRespondLogDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(DeptRespondLogDTO dto) { - DeptRespondLogEntity entity = ConvertUtils.sourceToTarget(dto, DeptRespondLogEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeptRespondLogDTO dto) { - DeptRespondLogEntity entity = ConvertUtils.sourceToTarget(dto, DeptRespondLogEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/controller/DeptKpiConfigController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/controller/DeptKpiConfigController.java deleted file mode 100644 index db8f9d0f7..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/controller/DeptKpiConfigController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -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.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.rule.DeptKpiConfigDTO; -import com.elink.esua.epdc.modules.rule.excel.DeptKpiConfigExcel; -import com.elink.esua.epdc.modules.rule.service.DeptKpiConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@RestController -@RequestMapping("deptkpiconfig") -public class DeptKpiConfigController { - - @Autowired - private DeptKpiConfigService deptKpiConfigService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = deptKpiConfigService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - DeptKpiConfigDTO data = deptKpiConfigService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody DeptKpiConfigDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - deptKpiConfigService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody DeptKpiConfigDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - deptKpiConfigService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - deptKpiConfigService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = deptKpiConfigService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, DeptKpiConfigExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/dao/DeptKpiConfigDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/dao/DeptKpiConfigDao.java deleted file mode 100644 index 1caa6de84..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/dao/DeptKpiConfigDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.rule.entity.DeptKpiConfigEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@Mapper -public interface DeptKpiConfigDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/entity/DeptKpiConfigEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/entity/DeptKpiConfigEntity.java deleted file mode 100644 index 490bc2989..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/entity/DeptKpiConfigEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_dept_kpi_config") -public class DeptKpiConfigEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 绩效指标编码 - */ - private String kpiItemCode; - - /** - * 绩效指标值 - */ - private Integer kpiItemValue; - - /** - * 绩效指标描述 - */ - private String kpiItemDesc; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/excel/DeptKpiConfigExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/excel/DeptKpiConfigExcel.java deleted file mode 100644 index a9092adb9..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/excel/DeptKpiConfigExcel.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@Data -public class DeptKpiConfigExcel { - - @Excel(name = "ID") - private String id; - - @Excel(name = "绩效指标编码") - private String kpiItemCode; - - @Excel(name = "绩效指标值") - private Integer kpiItemValue; - - @Excel(name = "绩效指标描述") - private String kpiItemDesc; - - @Excel(name = "删除标识 0：未删除，1：删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/redis/DeptKpiConfigRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/redis/DeptKpiConfigRedis.java deleted file mode 100644 index 2d3edfa20..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/redis/DeptKpiConfigRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@Component -public class DeptKpiConfigRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/DeptKpiConfigService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/DeptKpiConfigService.java deleted file mode 100644 index 7ce501ae3..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/DeptKpiConfigService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.rule.DeptKpiConfigDTO; -import com.elink.esua.epdc.modules.rule.entity.DeptKpiConfigEntity; - -import java.util.List; -import java.util.Map; - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -public interface DeptKpiConfigService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-10-21 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-10-21 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return DeptKpiConfigDTO - * @author generator - * @date 2019-10-21 - */ - DeptKpiConfigDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-10-21 - */ - void save(DeptKpiConfigDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-10-21 - */ - void update(DeptKpiConfigDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-10-21 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/DeptKpiConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/DeptKpiConfigServiceImpl.java deleted file mode 100644 index 43d7e4900..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/DeptKpiConfigServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rule.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.rule.dao.DeptKpiConfigDao; -import com.elink.esua.epdc.dto.rule.DeptKpiConfigDTO; -import com.elink.esua.epdc.modules.rule.entity.DeptKpiConfigEntity; -import com.elink.esua.epdc.modules.rule.redis.DeptKpiConfigRedis; -import com.elink.esua.epdc.modules.rule.service.DeptKpiConfigService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 考核规则 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-21 - */ -@Service -public class DeptKpiConfigServiceImpl extends BaseServiceImpl implements DeptKpiConfigService { - - @Autowired - private DeptKpiConfigRedis deptKpiConfigRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, DeptKpiConfigDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, DeptKpiConfigDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public DeptKpiConfigDTO get(String id) { - DeptKpiConfigEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, DeptKpiConfigDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(DeptKpiConfigDTO dto) { - DeptKpiConfigEntity entity = ConvertUtils.sourceToTarget(dto, DeptKpiConfigEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeptKpiConfigDTO dto) { - DeptKpiConfigEntity entity = ConvertUtils.sourceToTarget(dto, DeptKpiConfigEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/controller/DeptRespondTimeConfigController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/controller/DeptRespondTimeConfigController.java deleted file mode 100644 index 67a67eb81..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/controller/DeptRespondTimeConfigController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -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.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.time.DeptRespondTimeConfigDTO; -import com.elink.esua.epdc.modules.time.excel.DeptRespondTimeConfigExcel; -import com.elink.esua.epdc.modules.time.service.DeptRespondTimeConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@RestController -@RequestMapping("deptrespondtimeconfig") -public class DeptRespondTimeConfigController { - - @Autowired - private DeptRespondTimeConfigService deptRespondTimeConfigService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = deptRespondTimeConfigService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - DeptRespondTimeConfigDTO data = deptRespondTimeConfigService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody DeptRespondTimeConfigDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - deptRespondTimeConfigService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody DeptRespondTimeConfigDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - deptRespondTimeConfigService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - deptRespondTimeConfigService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = deptRespondTimeConfigService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, DeptRespondTimeConfigExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/dao/DeptRespondTimeConfigDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/dao/DeptRespondTimeConfigDao.java deleted file mode 100644 index f082f1715..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/dao/DeptRespondTimeConfigDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.time.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.time.entity.DeptRespondTimeConfigEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@Mapper -public interface DeptRespondTimeConfigDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/entity/DeptRespondTimeConfigEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/entity/DeptRespondTimeConfigEntity.java deleted file mode 100644 index 0d913789a..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/entity/DeptRespondTimeConfigEntity.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.time.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_dept_respond_time_config") -public class DeptRespondTimeConfigEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 议题或项目类别ID(不可重复) - */ - private String categoryId; - - /** - * 类别名称 - */ - private String categoryName; - - /** - * 网格长在多少小时内响应算是有效响应 - */ - private Integer gridValidRespLimitHour; - - /** - * 网格长在多少小时内关闭算是有效关闭 - */ - private Integer gridValidCloseLimitHour; - - /** - * 社区在多少小时内响应算是有效响应 - */ - private Integer commValidRespLimitHour; - - /** - * 街道在多少小时内响应算是有效响应 - */ - private Integer streetValidRespLimitHour; - - /** - * 区直在多少小时内响应算是有效响应 - */ - private Integer districtValidRespLimitHour; - - /** - * 超过多少小时响应算是无效响应。此值应大于各部门的有效响应值。若响应发生在有效响应与无效响应之间，为超时响应。 - */ - private Integer invalidRespLimitHour; - - /** - * 有效响应系数 - */ - private BigDecimal validRespCoefficient; - - /** - * 超时响应系数 - */ - private BigDecimal overtimeRespCoefficient; - - /** - * 无效响应系数 - */ - private BigDecimal invalidRespCoefficient; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/excel/DeptRespondTimeConfigExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/excel/DeptRespondTimeConfigExcel.java deleted file mode 100644 index d9fd7ea01..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/excel/DeptRespondTimeConfigExcel.java +++ /dev/null @@ -1,90 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.time.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@Data -public class DeptRespondTimeConfigExcel { - - @Excel(name = "ID") - private String id; - - @Excel(name = "议题或项目类别ID(不可重复)") - private String categoryId; - - @Excel(name = "类别名称") - private String categoryName; - - @Excel(name = "网格长在多少小时内响应算是有效响应") - private Integer gridValidRespLimitHour; - - @Excel(name = "网格长在多少小时内关闭算是有效关闭") - private Integer gridValidCloseLimitHour; - - @Excel(name = "社区在多少小时内响应算是有效响应") - private Integer commValidRespLimitHour; - - @Excel(name = "街道在多少小时内响应算是有效响应") - private Integer streetValidRespLimitHour; - - @Excel(name = "区直在多少小时内响应算是有效响应") - private Integer districtValidRespLimitHour; - - @Excel(name = "超过多少小时响应算是无效响应。此值应大于各部门的有效响应值。若响应发生在有效响应与无效响应之间，为超时响应。") - private Integer invalidRespLimitHour; - - @Excel(name = "有效响应系数") - private BigDecimal validRespCoefficient; - - @Excel(name = "超时响应系数") - private BigDecimal overtimeRespCoefficient; - - @Excel(name = "无效响应系数") - private BigDecimal invalidRespCoefficient; - - @Excel(name = "删除标识 0：未删除，1：删除") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/redis/DeptRespondTimeConfigRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/redis/DeptRespondTimeConfigRedis.java deleted file mode 100644 index 7126b78f4..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/redis/DeptRespondTimeConfigRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.time.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@Component -public class DeptRespondTimeConfigRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/DeptRespondTimeConfigService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/DeptRespondTimeConfigService.java deleted file mode 100644 index 22e891acb..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/DeptRespondTimeConfigService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.time.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.time.DeptRespondTimeConfigDTO; -import com.elink.esua.epdc.modules.time.entity.DeptRespondTimeConfigEntity; - -import java.util.List; -import java.util.Map; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -public interface DeptRespondTimeConfigService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-10-23 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-10-23 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return DeptRespondTimeConfigDTO - * @author generator - * @date 2019-10-23 - */ - DeptRespondTimeConfigDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-10-23 - */ - void save(DeptRespondTimeConfigDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-10-23 - */ - void update(DeptRespondTimeConfigDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-10-23 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/impl/DeptRespondTimeConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/impl/DeptRespondTimeConfigServiceImpl.java deleted file mode 100644 index d8d41269a..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/time/service/impl/DeptRespondTimeConfigServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.time.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.time.dao.DeptRespondTimeConfigDao; -import com.elink.esua.epdc.dto.time.DeptRespondTimeConfigDTO; -import com.elink.esua.epdc.modules.time.entity.DeptRespondTimeConfigEntity; -import com.elink.esua.epdc.modules.time.redis.DeptRespondTimeConfigRedis; -import com.elink.esua.epdc.modules.time.service.DeptRespondTimeConfigService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 绩效考核时间规则表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-10-23 - */ -@Service -public class DeptRespondTimeConfigServiceImpl extends BaseServiceImpl implements DeptRespondTimeConfigService { - - @Autowired - private DeptRespondTimeConfigRedis deptRespondTimeConfigRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, DeptRespondTimeConfigDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, DeptRespondTimeConfigDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public DeptRespondTimeConfigDTO get(String id) { - DeptRespondTimeConfigEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, DeptRespondTimeConfigDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(DeptRespondTimeConfigDTO dto) { - DeptRespondTimeConfigEntity entity = ConvertUtils.sourceToTarget(dto, DeptRespondTimeConfigEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeptRespondTimeConfigDTO dto) { - DeptRespondTimeConfigEntity entity = ConvertUtils.sourceToTarget(dto, DeptRespondTimeConfigEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/log/DeptRespondLogDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/log/DeptRespondLogDao.xml deleted file mode 100644 index 52fb4fe51..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/log/DeptRespondLogDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rule/DeptKpiConfigDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rule/DeptKpiConfigDao.xml deleted file mode 100644 index 24a56affc..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rule/DeptKpiConfigDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/tiime/DeptRespondTimeConfigDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/tiime/DeptRespondTimeConfigDao.xml deleted file mode 100644 index be817060e..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/tiime/DeptRespondTimeConfigDao.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file