From bea33551205f73730dae652fe034fb5924841c8d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 21 Oct 2021 18:41:43 +0800 Subject: [PATCH 01/30] =?UTF-8?q?Revert=20"=E6=9A=82=E6=97=B6=E4=BD=8F?= =?UTF-8?q?=E6=8E=89=E5=8F=91=E9=80=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 46afef7a --- .../main/java/com/epmet/mq/ProjectChangedCustomListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java index 8681c525da..72e12ff5dc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java @@ -14,6 +14,7 @@ import com.epmet.constant.SystemMessageType; import com.epmet.dto.extract.form.ExtractOriginFormDTO; import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService; import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService; +import com.epmet.service.evaluationindex.screen.ScreenProjectDataService; import com.epmet.util.DimIdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -160,7 +161,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently type = SystemMessageType.PROJECT_EDIT; } DisputeProcessMQMsg msg = new DisputeProcessMQMsg(customerId, msgObj.getProjectId(), type); - //SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg); + SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg); } catch (RenException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 logger.error("【RocketMQ】消费项目变动消息失败:",e); From 8f099eb6b435f53270025c0b8659a8f75bcd7f48 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 Oct 2021 10:49:46 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E4=B8=AD=E9=97=B4=E8=A1=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/dto/BaseConflictsResolveDTO.java | 77 +++++++++++++++++++ .../com/epmet/opendata/dto/ExUserDTO.java | 76 ++++++++++++++++++ .../opendata/dao/BaseConflictsResolveDao.java | 33 ++++++++ .../com/epmet/opendata/dao/ExUserDao.java | 33 ++++++++ .../entity/BaseConflictsResolveEntity.java | 48 ++++++++++++ .../epmet/opendata/entity/ExUserEntity.java | 72 +++++++++++++++++ .../service/BaseConflictsResolveService.java | 31 ++++++++ .../epmet/opendata/service/ExUserService.java | 31 ++++++++ .../impl/BaseConflictsResolveServiceImpl.java | 36 +++++++++ .../service/impl/ExUserServiceImpl.java | 48 ++++++++++++ 10 files changed, 485 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExUserDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseConflictsResolveDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExUserDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExUserEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseConflictsResolveService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseConflictsResolveServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java new file mode 100644 index 0000000000..00c96a08f6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java @@ -0,0 +1,77 @@ +/** + * 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.epmet.opendata.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 事件中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Data +public class BaseConflictsResolveDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 事件ID + */ + private String id; + + /** + * 事件信息 + */ + private String eventInfo; + + /** + * 事件所属网格ID + */ + private String gridId; + + /** + * + */ + private String delFlag; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExUserDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExUserDTO.java new file mode 100644 index 0000000000..d0f61777ca --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExUserDTO.java @@ -0,0 +1,76 @@ +/** + * 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.epmet.opendata.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 系统用户中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Data +public class ExUserDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 市平台 用户ID + */ + private String userId; + + /** + * 市平台 用户名 + */ + private String userName; + + /** + * 市平台 用户身份证号 + */ + private String idCard; + + /** + * 市平台 用户手机号 + */ + private String mobile; + + /** + * 区县平台 用户ID + */ + private String userIdQx; + + /** + * 区县平台 用户名 + */ + private String userNameQx; + + /** + * 区县平台 用户账号 + */ + private String userAccount; + + /** + * 删除标识 + */ + private String delFlag; + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseConflictsResolveDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseConflictsResolveDao.java new file mode 100644 index 0000000000..29be2a6c23 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseConflictsResolveDao.java @@ -0,0 +1,33 @@ +/** + * 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.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.BaseConflictsResolveEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Mapper +public interface BaseConflictsResolveDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExUserDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExUserDao.java new file mode 100644 index 0000000000..4a3c4ecc13 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExUserDao.java @@ -0,0 +1,33 @@ +/** + * 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.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.ExUserEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统用户中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Mapper +public interface ExUserDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java new file mode 100644 index 0000000000..fe9a50a92a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java @@ -0,0 +1,48 @@ +/** + * 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.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 事件中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("base_conflicts_resolve") +public class BaseConflictsResolveEntity { + + private static final long serialVersionUID = 1L; + + /** + * 事件信息 + */ + private String eventInfo; + + /** + * 事件所属网格ID + */ + private String gridId; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExUserEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExUserEntity.java new file mode 100644 index 0000000000..f178336ab1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExUserEntity.java @@ -0,0 +1,72 @@ +/** + * 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.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 系统用户中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ex_user") +public class ExUserEntity { + + private static final long serialVersionUID = 1L; + + /** + * 市平台 用户ID + */ + private String userId; + + /** + * 市平台 用户名 + */ + private String userName; + + /** + * 市平台 用户身份证号 + */ + private String idCard; + + /** + * 市平台 用户手机号 + */ + private String mobile; + + /** + * 区县平台 用户ID + */ + private String userIdQx; + + /** + * 区县平台 用户名 + */ + private String userNameQx; + + /** + * 区县平台 用户账号 + */ + private String userAccount; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseConflictsResolveService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseConflictsResolveService.java new file mode 100644 index 0000000000..85cb47c7b9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseConflictsResolveService.java @@ -0,0 +1,31 @@ +/** + * 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.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.opendata.entity.BaseConflictsResolveEntity; + +/** + * 事件中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +public interface BaseConflictsResolveService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java new file mode 100644 index 0000000000..9c76d86500 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java @@ -0,0 +1,31 @@ +/** + * 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.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.opendata.entity.ExUserEntity; + +/** + * 系统用户中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +public interface ExUserService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseConflictsResolveServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseConflictsResolveServiceImpl.java new file mode 100644 index 0000000000..270cbb365f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseConflictsResolveServiceImpl.java @@ -0,0 +1,36 @@ +/** + * 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.epmet.opendata.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.opendata.dao.BaseConflictsResolveDao; +import com.epmet.opendata.entity.BaseConflictsResolveEntity; +import com.epmet.opendata.service.BaseConflictsResolveService; +import org.springframework.stereotype.Service; + +/** + * 事件中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Service +public class BaseConflictsResolveServiceImpl extends BaseServiceImpl implements BaseConflictsResolveService { + + +} \ No newline at end of file diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java new file mode 100644 index 0000000000..4badca6794 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java @@ -0,0 +1,48 @@ +/** + * 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.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.opendata.dao.ExUserDao; +import com.epmet.opendata.dto.ExUserDTO; +import com.epmet.opendata.entity.ExUserEntity; +import com.epmet.opendata.service.ExUserService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 系统用户中间表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-10-22 + */ +@Service +public class ExUserServiceImpl extends BaseServiceImpl implements ExUserService { + + +} \ No newline at end of file From d1d3b09fbdd3b94989e9ab012814f1847f9dab59 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 Oct 2021 10:52:37 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0projectCreator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java index 66e3943591..d4a767f525 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java @@ -132,4 +132,8 @@ public class ScreenProjectDataInfoFormDTO implements Serializable { * 满意度得分 */ private BigDecimal satisfactionScore; + /** + * 项目创建人 + */ + private String projectCreator; } From 2d11c3b0d17a84d9f3296a37ddd03c723eb76d11 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Oct 2021 10:35:50 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/service/impl/BaseGridInfoServiceImpl.java | 7 +++++-- .../opendata/service/impl/BaseGridUserServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java index 7802dfc707..8c7fd0d5c8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.opendata.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.org.result.CustomerAgencyDTO; import com.epmet.dto.org.result.CustomerGridDTO; @@ -58,7 +59,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO); + com.epmet.dto.org.form.GridBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.org.form.GridBaseInfoFormDTO.class); + Result> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO1); if (!result.success()) { throw new RenException(result.getInternalMsg()); } @@ -110,7 +112,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO); + com.epmet.dto.org.form.GridBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.org.form.GridBaseInfoFormDTO.class); + Result> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO1); if (!result.success()) { throw new RenException(result.getInternalMsg()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java index c323a8e2c4..6a8902a38b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java @@ -56,7 +56,8 @@ public class BaseGridUserServiceImpl extends BaseServiceImpl> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO); + com.epmet.dto.user.form.StaffBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.user.form.StaffBaseInfoFormDTO.class); + Result> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO1); if (!result.success()) { throw new RenException(result.getInternalMsg()); } From e8cacc3cf6eb3157807dc2c7827bf027e4c01939 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 2 Nov 2021 09:20:18 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/controller/BaseGridInfoController.java | 4 ++-- .../opendata/service/impl/BaseGridInfoServiceImpl.java | 3 ++- .../src/main/resources/mapper/ExDeptDao.xml | 9 ++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridInfoController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridInfoController.java index 531ecc8cde..628c4802ca 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridInfoController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridInfoController.java @@ -44,7 +44,7 @@ public class BaseGridInfoController { /** * @Author sun - * @Description 组织基础信息中介库同步 + * @Description 组织基础信息中间库同步 **/ @PostMapping("agencybaseinfo") public Result getAgencyBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) { @@ -55,7 +55,7 @@ public class BaseGridInfoController { /** * @Author sun - * @Description 网格基础信息中介库同步 + * @Description 网格基础信息中间库同步 **/ @PostMapping("gridbaseinfo") public Result getGridBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) { diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java index 8c7fd0d5c8..e50d9404e4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java @@ -144,7 +144,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl - when grid_code = #{item.gridCode} then #{item.deptIdQx} + + when dept_name_qx = #{item.deptNameQx} then #{item.deptIdQx} @@ -29,7 +30,8 @@ - when grid_code = #{item.gridCode} then #{item.deptNameQx} + when dept_name_qx = #{item.deptNameQx} then #{item.deptIdQx} + @@ -38,7 +40,8 @@ WHERE 1=1 - grid_code = #{item.gridCode} + + dept_name_qx = #{item.deptNameQx} From b2f40e8ad9d4145b1003dddd122cf96ced1bdb3f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 5 Nov 2021 14:17:26 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=92=8C=E7=BD=91=E6=A0=BC=E6=A0=91=20=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=8A=A0=E5=88=B0=E7=BB=84=E7=BB=87=E9=87=8C=E9=9D=A2=20?= =?UTF-8?q?=E5=B9=B3=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/AgencyResultDTO.java | 5 +- .../epmet/dto/result/AgencyTreeResultDTO.java | 2 + .../controller/CustomerAgencyController.java | 14 ++++- .../java/com/epmet/dao/CustomerAgencyDao.java | 9 ++- .../epmet/service/CustomerAgencyService.java | 10 +++- .../impl/CustomerAgencyServiceImpl.java | 58 ++++++++++++++++++- .../resources/mapper/CustomerAgencyDao.xml | 25 ++++++-- 7 files changed, 113 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java index e4592c5b0b..808e25d791 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java @@ -41,9 +41,12 @@ public class AgencyResultDTO implements Serializable { * 机关组织名称 */ private String agencyName = ""; + + private String pid; + private String level; /** * 所有上级组织机构ID(以英文:隔开) */ @JsonIgnore private String pids = ""; -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java index 896ebfb57c..3afae3011a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java @@ -24,6 +24,8 @@ public class AgencyTreeResultDTO implements Serializable { private String agencyName; private String pid; + + private String level; /** * 下级机关组织 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index c3937127ba..1b12beb474 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -325,7 +325,7 @@ public class CustomerAgencyController { } /** - * @Description 获取客户下组织树 + * @Description 获取客户下组织树不含网格和部门 * @Param tokenDTO * @Return {@link Result< AgencyTreeResultDTO >} * @Author zhaoqifeng @@ -339,4 +339,16 @@ public class CustomerAgencyController { return new Result().ok(customerAgencyService.getAgencyList(formDTO)); } + /** + * @Description 获取当前登陆人的 所属组织及下级组织/网格（含直属网格）树 + * @Param tokenDTO + * @Return {@link Result< AgencyTreeResultDTO >} + * @Author zhaoqifeng + * @Date 2021/9/8 15:20 + */ + @PostMapping("agencygridtree") + public Result getOrgTreeData(@LoginUser TokenDto tokenDTO) { + return new Result().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId())); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 145178f50f..971117874d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -243,4 +243,11 @@ public interface CustomerAgencyDao extends BaseDao { AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId); List getSubAgencyList(@Param("pid") String pid); -} \ No newline at end of file + + /** + * desc：获取组织网格树 含直属网格 + * @param agencyId + * @return + */ + AgencyTreeResultDTO getAgencyGridTree(String agencyId); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index b13bae23e7..96932318db 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -19,7 +19,6 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; @@ -255,4 +254,11 @@ public interface CustomerAgencyService extends BaseService * @Date 2021/9/8 15:21 */ AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO); -} \ No newline at end of file + + /** + * desc:获取用户所属组织的组织及网格树 + * @param staffId + * @return + */ + AgencyTreeResultDTO getOrgTreeData(String staffId); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index fc9f181a20..451a50deb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -16,7 +16,6 @@ */ package com.epmet.service.impl; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -1107,6 +1106,63 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl%s", staffId)); + throw new RenException(CustomerAgencyConstant.SELECT_STAFF_AGENCY_EXCEPTION); + } + result.setPid(rootAgency.getPid()); + result.setAgencyName(rootAgency.getAgencyName()); + result.setAgencyId(rootAgency.getAgencyId()); + result.setLevel(rootAgency.getLevel()); + ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId()); + convert2AgencyTreeResult(result,res.getSubAgencyList(),res.getGridList()); + return result; + } + /** + * 递归查询子节点 + * @param root 根节点 + * @param all 所有节点 + * @return 根节点信息 + */ + private void convert2AgencyTreeResult(AgencyTreeResultDTO root, List agencyList, List gridList) { + try { + for (ExtStaffPermissionResultDTO agency : agencyList) { + AgencyTreeResultDTO resultDTO = new AgencyTreeResultDTO(); + resultDTO.setAgencyId(agency.getAgencyId()); + resultDTO.setAgencyName(agency.getAgencyName()); + resultDTO.setPid(root.getAgencyId()); + resultDTO.setLevel(agency.getLevel()); + + if (root.getSubAgencyList() == null) { + root.setSubAgencyList(new ArrayList<>()); + } + root.getSubAgencyList().add(resultDTO); + if (CollectionUtils.isNotEmpty(agency.getSubAgencyList()) || CollectionUtils.isNotEmpty(agency.getGridList())) { + convert2AgencyTreeResult(resultDTO, agency.getSubAgencyList(), agency.getGridList()); + } + } + for (ExtGridResultDTO o : gridList) { + AgencyTreeResultDTO grid = new AgencyTreeResultDTO(); + grid.setAgencyId(o.getGridId()); + grid.setAgencyName(o.getGridName()); + grid.setPid(root.getAgencyId()); + grid.setLevel("grid"); + grid.setSubAgencyList(null); + if (root.getSubAgencyList() == null) { + root.setSubAgencyList(new ArrayList<>()); + } + root.getSubAgencyList().add(grid); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + /** * @Description 组织树最后一级没有数据的话设null * @Param agencyList diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 89a5df87f4..9d7564368e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -304,7 +304,9 @@ SELECT ca.id AS "agencyId", ca.organization_name AS "agencyName", - ca.pids AS "pids" + ca.pids AS "pids", + ca.PID AS pid, + ca.LEVEL FROM customer_agency ca INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id @@ -507,6 +509,7 @@ + @@ -519,18 +522,32 @@ select ID AS agencyId, ORGANIZATION_NAME AS agencyName, - PID + PID, + LEVEL from customer_agency where DEL_FLAG = 0 AND PID= #{pid} ORDER BY ID + - \ No newline at end of file + From ef484d6af8fd13c4ee6e85034820985fa5a770e2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 5 Nov 2021 14:21:10 +0800 Subject: [PATCH 07/30] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerAgencyDao.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 9d7564368e..f49a8cf4e6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -530,18 +530,6 @@ AND PID= #{pid} ORDER BY ID - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index e890e36389..08bd089160 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -158,4 +158,24 @@ AND UNIX_TIMESTAMP(pd.CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL #{monthCount} MONTH)) ) + + + diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml index 4189b03d16..0294005b7f 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml @@ -54,4 +54,30 @@ )and m.CUSTOMER_ID=#{customerId} order by resolvedRatio+0 desc + + + + + + \ No newline at end of file From 3a07521d40ebb35748798ee0b860d9f5a804f941 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Nov 2021 15:13:23 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GovOrgController.java | 31 ++++++++++++++++--- .../service/govorg/GovOrgService.java | 18 +++++++++++ .../govorg/impl/GovOrgServiceImpl.java | 23 ++++++++++++++ 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 17f939b2c6..72815d45b3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -9,18 +9,19 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; +import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; +import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; +import com.epmet.dataaggre.entity.govorg.CustomerGridEntity; import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums; import com.epmet.dataaggre.service.AggreGridService; import com.epmet.dataaggre.service.govorg.GovOrgService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -178,4 +179,26 @@ public class GovOrgController { return new Result>().ok(govOrgService.getAgencyTree(tokenDto, formDTO)); } + /** + * @Description 查询组织信息 + * @param agencyId + * @author zxc + * @date 2021/11/5 2:54 下午 + */ + @PostMapping("agency") + public Result getAgencyInfo(@RequestParam("agencyId")String agencyId){ + return new Result().ok(govOrgService.getAgencyInfo(agencyId)); + } + + /** + * @Description 查询网格信息 + * @param gridId + * @author zxc + * @date 2021/11/5 2:54 下午 + */ + @PostMapping("grid") + public Result getGridInfo(@RequestParam("gridId")String gridId){ + return new Result().ok(govOrgService.getGridInfo(gridId)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 41b97b57ac..a927352031 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -10,6 +10,8 @@ import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; +import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; +import com.epmet.dataaggre.entity.govorg.CustomerGridEntity; import java.util.List; @@ -154,4 +156,20 @@ public interface GovOrgService { * @Date 2021/9/23 10:14 */ List getStaffOrgList(String staffId); + + /** + * @Description 查询组织信息 + * @param agencyId + * @author zxc + * @date 2021/11/5 2:54 下午 + */ + CustomerAgencyEntity getAgencyInfo(String agencyId); + + /** + * @Description 查询网格信息 + * @param gridId + * @author zxc + * @date 2021/11/5 2:57 下午 + */ + CustomerGridEntity getGridInfo(String gridId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index d4e265cdec..eaf846cf45 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -20,6 +20,7 @@ import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; +import com.epmet.dataaggre.entity.govorg.CustomerGridEntity; import com.epmet.dataaggre.service.commonservice.AreaCodeService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -532,4 +533,26 @@ public class GovOrgServiceImpl implements GovOrgService { return customerAgencyDao.getOrgList(staffId); } + /** + * @Description 查询组织信息 + * @param agencyId + * @author zxc + * @date 2021/11/5 2:54 下午 + */ + @Override + public CustomerAgencyEntity getAgencyInfo(String agencyId) { + return customerAgencyDao.selectById(agencyId); + } + + /** + * @Description 查询网格信息 + * @param gridId + * @author zxc + * @date 2021/11/5 2:57 下午 + */ + @Override + public CustomerGridEntity getGridInfo(String gridId) { + return customerGridDao.selectById(gridId); + } + } From 1e30a72cac4fc714c3175c22485c4ab09bc68d1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Nov 2021 15:50:00 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/feign/CommonAggFeignClient.java | 21 +++ .../CommonAggFeignClientFallback.java | 12 ++ .../tools/redis/common/CustomerOrgRedis.java | 93 +++++++++++++ .../redis/common/bean/AgencyInfoCache.java | 126 ++++++++++++++++++ .../redis/common/bean/GridInfoCache.java | 111 +++++++++++++++ .../controller/GovOrgController.java | 4 +- .../dataaggre/dao/govorg/CustomerGridDao.java | 8 ++ .../service/govorg/GovOrgService.java | 2 +- .../govorg/impl/GovOrgServiceImpl.java | 4 +- .../mapper/govorg/CustomerGridDao.xml | 12 ++ .../result/CategoryProjectListResultDTO.java | 5 + .../screen/impl/ScreenProjectServiceImpl.java | 29 ++-- .../mapper/screen/ScreenProjectDataDao.xml | 3 +- 13 files changed, 414 insertions(+), 16 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java index 5bfb7b698f..5a03583011 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java @@ -2,11 +2,14 @@ package com.epmet.commons.tools.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.feign.fallback.CommonAggFeignClientFallBackFactory; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; /** @@ -24,4 +27,22 @@ public interface CommonAggFeignClient { */ @PostMapping("/data/aggregator/epmetuser/getStaffInfo/{staffId}") Result getStaffInfo(@PathVariable("staffId") String staffId); + + /** + * @Description 查询组织信息 + * @param agencyId + * @author zxc + * @date 2021/11/5 2:54 下午 + */ + @PostMapping("/data/aggregator/org/agency") + Result getAgencyInfo(@RequestParam("agencyId")String agencyId); + + /** + * @Description 查询网格信息 + * @param gridId + * @author zxc + * @date 2021/11/5 2:54 下午 + */ + @PostMapping("/data/aggregator/org/grid") + Result getGridInfo(@RequestParam("gridId")String gridId); } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java index 2495d6b588..02f209f4f2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java @@ -2,7 +2,9 @@ package com.epmet.commons.tools.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.feign.CommonAggFeignClient; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import org.springframework.stereotype.Component; @@ -20,4 +22,14 @@ public class CommonAggFeignClientFallback implements CommonAggFeignClient { public Result getStaffInfo(String staffId) { return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getStaffInfo", staffId); } + + @Override + public Result getAgencyInfo(String agencyId) { + return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getAgencyInfo", agencyId); + } + + @Override + public Result getGridInfo(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getGridInfo", gridId); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java new file mode 100644 index 0000000000..9cf82c29d6 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java @@ -0,0 +1,93 @@ +package com.epmet.commons.tools.redis.common; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.CommonAggFeignClient; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.bean.*; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.PostConstruct; +import java.util.Map; + +/** + * @Author zxc + * @DateTime 2021/11/5 2:29 下午 + * @DESC + */ +@Slf4j +@Component +public class CustomerOrgRedis { + + @Autowired + private RedisUtils redisUtils; + + @Autowired + private CommonAggFeignClient commonAggFeignClient; + + private static CustomerOrgRedis customerOrgRedis; + private static final String ROLE_MAP_KEY = "roleMap"; + + @PostConstruct + public void init() { + customerOrgRedis = this; + customerOrgRedis.redisUtils = this.redisUtils; + customerOrgRedis.commonAggFeignClient = this.commonAggFeignClient; + } + + /** + * @Description 获取网格信息 + * @param gridId + * @author zxc + * @date 2021/11/5 3:12 下午 + */ + public static GridInfoCache getGridInfo(String gridId){ + String key = RedisKeys.getGridInfoKey(gridId); + Map grid = customerOrgRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(grid)) { + return ConvertUtils.mapToEntity(grid, GridInfoCache.class); + } + Result gridInfoResult = customerOrgRedis.commonAggFeignClient.getGridInfo(gridId); + if (!gridInfoResult.success()){ + throw new RenException("查询网格信息失败..."); + } + if (null == gridInfoResult.getData()){ + throw new RenException("没有此网格信息..."); + } + Map map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true); + customerOrgRedis.redisUtils.hMSet(key, map); + return gridInfoResult.getData(); + } + + /** + * @Description 获取组织信息 + * @param agencyId + * @author zxc + * @date 2021/11/5 3:12 下午 + */ + public static AgencyInfoCache getAgencyInfo(String agencyId){ + String key = RedisKeys.getAgencyByIdKey(agencyId); + Map agency = customerOrgRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(agency)) { + return ConvertUtils.mapToEntity(agency, AgencyInfoCache.class); + } + Result agencyInfoResult = customerOrgRedis.commonAggFeignClient.getAgencyInfo(agencyId); + if (!agencyInfoResult.success()){ + throw new RenException("查询组织信息失败..."); + } + if (null == agencyInfoResult.getData()){ + throw new RenException("没有此组织信息..."); + } + Map map = BeanUtil.beanToMap(agencyInfoResult.getData(), false, true); + customerOrgRedis.redisUtils.hMSet(key, map); + return agencyInfoResult.getData(); + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java new file mode 100644 index 0000000000..90bb2aef80 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java @@ -0,0 +1,126 @@ +package com.epmet.commons.tools.redis.common.bean; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2021/11/5 2:45 下午 + * @DESC + */ +@Data +public class AgencyInfoCache implements Serializable { + + private static final long serialVersionUID = -1332373159954084159L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 上级组织机构ID + */ + private String pid; + + /** + * 所有上级组织机构ID(以英文:隔开) + */ + private String pids; + + /** + * 所有上级名称,以-连接 + */ + private String allParentName; + + /** + * 组织名称 + */ + private String organizationName; + + /** + * 机关级别（社区级：community， + 乡（镇、街道）级:street, + 区县级: district, + 市级: city + 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province） + */ + private String level; + + /** + * 地区编码 + */ + private String areaCode; + + /** + * 删除标识 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 总人数 + */ + private Integer totalUser; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区县 + */ + private String district; + + /** + * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701 + */ + private String parentAreaCode; + + /** + * 街道 + */ + private String street; + + /** + * 社区 + */ + private String community; +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java new file mode 100644 index 0000000000..f41f5c6f33 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java @@ -0,0 +1,111 @@ +package com.epmet.commons.tools.redis.common.bean; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2021/11/5 2:24 下午 + * @DESC + */ +@Data +public class GridInfoCache implements Serializable { + + private static final long serialVersionUID = -6159429894486235267L; + + + /** + * ID 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格名称 + */ + private String gridName; + + /** 组织-网格 */ + private String gridNamePath; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + + /** + * 所属地区码（所属组织地区码） + */ + private String areaCode; + + /** + * 删除标识:0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 管辖区域 + */ + private String manageDistrict; + + /** + * 当前网格总人数 + */ + private Integer totalUser; + + /** + * 所属组织机构ID（customer_organization.id） + */ + private String pid; + + /** + * 所有上级组织ID + */ + private String pids; + + /** + * 所属组织机构名 + */ + private String agencyName; + + /** + * 所有上级组织名 + */ + private String allParentName; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 72815d45b3..14500cc2ab 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -197,8 +197,8 @@ public class GovOrgController { * @date 2021/11/5 2:54 下午 */ @PostMapping("grid") - public Result getGridInfo(@RequestParam("gridId")String gridId){ - return new Result().ok(govOrgService.getGridInfo(gridId)); + public Result getGridInfo(@RequestParam("gridId")String gridId){ + return new Result().ok(govOrgService.getGridInfo(gridId)); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java index 56d07daafb..4ee22247f2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java @@ -76,4 +76,12 @@ public interface CustomerGridDao extends BaseDao { **/ List getGridListByAgencyId(@Param("agencyId") String agencyId); + /** + * @Description 查询网格信息 + * @param gridId + * @author zxc + * @date 2021/11/5 3:39 下午 + */ + CustomerGridDTO getGridInfo(@Param("gridId") String gridId); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index a927352031..77c8c33d0f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -171,5 +171,5 @@ public interface GovOrgService { * @author zxc * @date 2021/11/5 2:57 下午 */ - CustomerGridEntity getGridInfo(String gridId); + CustomerGridDTO getGridInfo(String gridId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index eaf846cf45..db39899f4f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -551,8 +551,8 @@ public class GovOrgServiceImpl implements GovOrgService { * @date 2021/11/5 2:57 下午 */ @Override - public CustomerGridEntity getGridInfo(String gridId) { - return customerGridDao.selectById(gridId); + public CustomerGridDTO getGridInfo(String gridId) { + return customerGridDao.getGridInfo(gridId); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 0fa266afc8..387e3264b4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -163,4 +163,16 @@ AND cg.pid = #{agencyId} + + + diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java index a4b64673ac..c1e191b8bb 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java @@ -40,6 +40,11 @@ public class CategoryProjectListResultDTO implements Serializable { */ private String createTime; + /** + * 项目ID + */ + private String projectId; + @JsonIgnore private String orgId; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 398010d5a2..3a71dbb206 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -5,7 +5,10 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -364,20 +367,26 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { formDTO.setOrgType(FactConstant.AGENCY); } PageCategoryProjectListResultDTO result = new PageCategoryProjectListResultDTO(); + List list; if (formDTO.getIsPage()){ PageInfo objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus())); - List list = objectPageInfo.getList(); + list = objectPageInfo.getList(); result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal()))); - if (!CollectionUtils.isEmpty(list)){ - list.forEach(l -> { - if (l.getOrgType().equals(FactConstant.AGENCY)){ - - }else { - - } - }); - } + }else { + list = screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus()); + } + if (!CollectionUtils.isEmpty(list)){ + list.forEach(l -> { + if (l.getOrgType().equals(FactConstant.AGENCY)){ + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(l.getOrgId()); + l.setGridName(agencyInfo.getOrganizationName()); + }else { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getOrgId()); + l.setGridName(gridInfo.getGridNamePath()); + } + }); } + result.setList(list); return result; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 08bd089160..27681bacad 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -167,7 +167,8 @@ IFNULL(PROJECT_TITLE,'') AS projectTitle, DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime, ORG_ID, - ORG_TYPE + ORG_TYPE, + PROJECT_ID FROM screen_project_data WHERE DEL_FLAG = '0' From 9066fd45d8fface7258cceef7983733f35e60c0a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Nov 2021 16:00:06 +0800 Subject: [PATCH 12/30] emm --- .../src/main/resources/mapper/govorg/CustomerGridDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 387e3264b4..fde243eafa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -167,7 +167,7 @@ @@ -104,7 +106,9 @@ p1.CATEGORY_CODE AS c, p2.CATEGORY_CODE AS c2, p1.CATEGORY_NAME AS n, - p2.CATEGORY_NAME AS n2 + p2.CATEGORY_NAME AS n2, + p1.PARENT_CATEGORY_CODE AS pc1, + p2.PARENT_CATEGORY_CODE AS pc2 FROM customer_project_category_dict p1,customer_project_category_dict p2 WHERE p1.DEL_FLAG = '0' AND p2.DEL_FLAG = '0' From 2d6d0e0b85d1c8802e28cec44554b645fbe1e778 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 8 Nov 2021 14:25:33 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CategoryProjectListFormDTO.java | 16 ++--- .../dto/form/ProjectCategoryFormDTO.java | 3 +- .../screen/ScreenProjectController.java | 64 ++++++++++++++---- .../excel/project_category_temp.xlsx | Bin 9409 -> 9439 bytes .../main/resources/excel/project_temp.xlsx | Bin 0 -> 9248 bytes 5 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/excel/project_temp.xlsx diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/CategoryProjectListFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/CategoryProjectListFormDTO.java index d182572061..3da140aa04 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/CategoryProjectListFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/CategoryProjectListFormDTO.java @@ -11,12 +11,13 @@ import java.io.Serializable; * @DESC */ @Data -public class CategoryProjectListFormDTO implements Serializable { +public class CategoryProjectListFormDTO extends ProjectCategoryFormDTO implements Serializable { private static final long serialVersionUID = -5448734274886241594L; public interface CategoryProjectListForm{} + @NotNull(message = "pageSize不能为空",groups = CategoryProjectListForm.class) private Integer pageSize; @@ -26,22 +27,21 @@ public class CategoryProjectListFormDTO implements Serializable { /** * 项目状态：closed：已结案，all：全部 */ - @NotNull(message = "status不能为空",groups = CategoryProjectListForm.class) + @NotNull(message = "status不能为空",groups = {CategoryProjectListForm.class, CategoryProjectExportForm.class}) private String status; - @NotNull(message = "categoryCode不能为空",groups = CategoryProjectListForm.class) + @NotNull(message = "categoryCode不能为空",groups = {CategoryProjectListForm.class, CategoryProjectExportForm.class}) private String categoryCode; + @NotNull(message = "categoryName不能为空",groups = CategoryProjectExportForm.class) + private String categoryName; + private String parentCategoryName; + /** * 组织ID */ private String orgId; - /** - * 组织类型：agency：组织，grid：网格 - */ - private String orgType; - /** * 是否分页，默认true，false的时候 给导出用 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/ProjectCategoryFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/ProjectCategoryFormDTO.java index 34043933bc..8cd3a4f083 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/ProjectCategoryFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/ProjectCategoryFormDTO.java @@ -16,6 +16,7 @@ public class ProjectCategoryFormDTO implements Serializable { private static final long serialVersionUID = 5047143743629810527L; public interface ProjectCategoryForm{} + public interface CategoryProjectExportForm {} /** * 组织ID @@ -27,7 +28,7 @@ public class ProjectCategoryFormDTO implements Serializable { */ private String orgType; - @NotBlank(message = "结束时间不能为空",groups = ProjectCategoryForm.class) + @NotBlank(message = "结束时间不能为空",groups = {ProjectCategoryForm.class,CategoryProjectExportForm.class}) private String endTime; /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index afc882a39d..3a58d96d4c 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -29,6 +29,7 @@ import com.epmet.project.dto.result.ProjectCategoryResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -195,20 +196,13 @@ public class ScreenProjectController { * @date 2021/11/4 3:38 下午 */ @PostMapping("selectprojectcategory/export") - public void selectProjectCategoryExport(@RequestBody ProjectCategoryFormDTO formDTO, /*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception { - tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); - tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); - ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.ProjectCategoryForm.class); + public void selectProjectCategoryExport(@RequestBody ProjectCategoryFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { + //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); + //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); List data = screenProjectService.selectProjectCategory(formDTO, tokenDto); String templatePath = "excel/project_category_temp.xlsx"; - StringBuilder dateBuilder = new StringBuilder(); - if (StringUtils.isNotBlank(formDTO.getStartTime())){ - dateBuilder.append(formDTO.getStartTime()).append(StrConstant.HYPHEN); - } - if (StringUtils.isNotBlank(formDTO.getEndTime())){ - dateBuilder.append(formDTO.getEndTime()); - } List resultDTOList = new ArrayList<>(); data.forEach(e->{ resultDTOList.add(e); @@ -219,7 +213,7 @@ public class ScreenProjectController { Map mapData = new HashMap<>(); mapData.put("list",resultDTOList); mapData.put("orgName",staffInfo.getAgencyName()); - mapData.put("exportDate",dateBuilder.toString()); + mapData.put("exportDate",getExportDateStr(formDTO.getStartTime(),formDTO.getEndTime())); Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData); response.setHeader("content-Type", "application/vnd.ms-excel"); response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目分类统计.xls", "UTF-8")); @@ -239,4 +233,50 @@ public class ScreenProjectController { return new Result().ok(screenProjectService.selectCategoryProjectList(formDTO,tokenDto)); } + /** + * @Description 【项目分类】查询项目分类 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2021/11/4 3:38 下午 + */ + @PostMapping("selectcategoryprojectlist/export") + public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO,/*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception { + tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548"); + tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc"); + formDTO.setIsPage(false); + formDTO.setStatus("all"); + formDTO.setCategoryCode("0102"); + ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class); + PageCategoryProjectListResultDTO data = screenProjectService.selectCategoryProjectList(formDTO,tokenDto); + String templatePath = "excel/project_temp.xlsx"; + + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + Map mapData = new HashMap<>(); + mapData.put("list",data.getList()); + mapData.put("orgName",staffInfo.getAgencyName()); + mapData.put("exportDate",getExportDateStr(formDTO.getStartTime(),formDTO.getEndTime())); + mapData.put("categoryName", formDTO.getCategoryName()); + if (StringUtils.isNotBlank(formDTO.getParentCategoryName())){ + mapData.put("categoryName", formDTO.getParentCategoryName().concat(StrConstant.HYPHEN).concat(formDTO.getCategoryName())); + } + + Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目统计.xls", "UTF-8")); + workbook.write(response.getOutputStream()); + } + + @NotNull + private String getExportDateStr(String startTime,String endTime) { + StringBuilder dateBuilder = new StringBuilder(); + if (StringUtils.isNotBlank(startTime)) { + dateBuilder.append(startTime).append(StrConstant.HYPHEN); + } + if (StringUtils.isNotBlank(endTime)) { + dateBuilder.append(endTime); + } + return dateBuilder.toString(); + } + } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/excel/project_category_temp.xlsx b/epmet-module/data-report/data-report-server/src/main/resources/excel/project_category_temp.xlsx index f12e92967d768f7ee7873566c8c431caabba3676..6054a88289f783eb48e4831805680dcd7824ba67 100644 GIT binary patch delta 5015 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 diff --git a/epmet-module/data-report/data-report-server/src/main/resources/excel/project_temp.xlsx b/epmet-module/data-report/data-report-server/src/main/resources/excel/project_temp.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..743bd60ecc64cd5359d5050345a7f4aa781c5058 GIT binary patch literal 9248 zcmaJ{1yo$ivc;X?1PGqNU4wfF9z3{1@WI_ZXprEpf#7a~yAvFO1$TG*ki2_ylXw5? zwPwz&GgV#PyG~X2sok=YkWdI58?wB`Kn#mrco$#Re)%Kb)~c&_0EeA)~7T^ zUnFQa%C>XCea#aM1CiL_a{X*pn-EP*ldCQlzkV$UXV9Rpp@%^9*wrZd)Zvs&VV5^y&Az ztE0U$dirJB>#d@=_D$IxNTw}Fxm}nBpANJz&9t)d=LXNv&Jt@0@Nu&D`ppD&FRHa7OuWoW27mCbscvDH$3jLG_jX}kx@z~OF! z>D55Trw)>|AUjz$c{j~?->K|X!3yd^=fN0Y`3A1ff;x&ub?L?WV(t{Im5G&D&^b_C z=rCf+_tXAxfEF&N;ob%Lu3ad%5uyhw?8VT8Z<)nhcFHM}kcSUH_HfBvfpt;6y0w5I zJ;xe${8Y8Mz*f=F(dY4$65Sz&wwyS&pd0tA?0J`Vn_G4GLcVKoI8p@NO_FPI=QJK3 zWm`of6Hz^(?{;dDG>P-0tarOGX=jeh&!C<0ABetNyv}8PX=lSinhIu^c5^Env-msW z99m7H6px4_JtB_r8{+o1c0h|K%yS}#CEFP>yAOOGgnL2KiS(M>v*D-R0z8x)jtnOC zSc%zyExVwH23*@zP?ps2tw`8G%Crh^tZ@CUo)$UCtN>Yd+0PO zn`3LJ1)&9#B!wxpr8QYCwW$;AX-B5$z2~l&OC`@!H%L2-o;A%^&4 zK><{ns1k8K6U@GgGe}wl_a+#c7W-+0-=gLR%sEl?YgVoU@kOC-`7hZY zDojtF`lLK#`JEBdoyg>#+D+;2?Kx0*<^~0Mczz8dk4F1_VZ zYeguz!C*qLa8H`r4;h3bu zZx#7xUy_|GlvA9)+Om!m;)hJ>JHv)cQd+*jReG*KuSPG0sO?vyk&QW<{(b{4s&iA4 zaZwa*7v?B1s-n@w0dwIF5DEy+W;9#f#NFrcoMO>D4UIqKAR;_(Q0Tz*V; zD#KXr=in}iqq;>~k*>Cfa-9KHdT*9teT2iv9aU&t80~>{ZW@ugMZJtcNeXF-b}DAq ztB`i_wc-SmiG;PIgQJ3C4x1~+*9$zQ$}A{h5=HW%%2O)KYeI(=knbTWg%BD1GE@y& z<)L87Cf}$rrnQBOvCf)%;eg|Cpcm%lG#|>O-)0N(Y|~|;sih>AZ{tmBwku4PZsDai z1nhlk^_57p5vYe$H8bPhNsqQCLaRpm!bfWQa?-uybC}ci%l)|^X(A@em#K6R+dy(g zlb6-*9hHKWiO~A^#()GEjVTy)wf0$jYFcwTmiO}Jim_4no^ zrEG~lJ~DI5)ti&}jTiIh1F0tt2dg5xgP({~{D=?_U$kf$7ar7n1d$}7SSiOjy=~Gj z%k#Ix>Gj%9Vv(OlY-ys@N`&97^{JTUAzb2z^xj+D5vE(wm|!R!-mM8^+J2FLrBHs0 z^8d%-)3W{;hjzw>7KVQ;>rw=-U}|2voK;_T3@wS*k30> zTp<$JyrYrNH0|yoq0`d_>?bX+3>+fY)!Uru3W4+opmj~UOEe3v31uL$qgb~u9pCsy z(BGtfq(nwDq}so;qK;&Tsz1M?7F%5a6xSJkMB$=?MNKNXc3!pDU$~!b~bMgVW zt;vzCZbIFXSC%UkvD3hl<{#uxg4fiLW1#DJIxbhgZFQvf$AhCJqRw+7cp+nkK(d}G zS?3sP+#QH3!Oi+2X5DHqhSyQAp z9^>GnNSWeTIzedY#+5AbWWac6DjY|zL3eX1$uyc|Ns0FD<#i{^!C6RNUPNjd-}Tz* z(aP8x{*5NucE}jf+~qF^&6hWGZ$Zte?ibs=?<^Y`kD4D&XMoKfTQF^WYRoQIXJh=S z{O(tS8=m)v9pH;A#^!Br0Ih8eAKo@{(|T8JwM-8j#WyE(Qi^tz3ou`=XSc_5DP+dvN&(~&J}tkh2A~z>U#$SA(Q9@t|QD+Kw^K;p>eF}e(%*l$GqU? zG@Ik|9A(p+3Z%;DS`7z%^U+3WIchmS1zO&-P-!NI!hJpxWsL~2mINJ)t$B(CKGLC& zp*_>o**T-&;=~NL&jrP*u#&P|7x=P@l`am;!u*iEKl|RoDbR#YjYws7tl9XXo5I|p z_D;XH;n?v0u!9Jn5YA|*#or-RYi?<+QWAOkf|zK(l4#Uf?`0i8A#PZ>BmTo~naL|r z@%6T6;&@5Z5uKP4n9el`cC8WdAmMSx9!QB-xi^HZ%Jsw8J`L%~Pi`C-tQ@%tQ4;iVb_NQiwLr6`TY>rZ$!K#~I}`Nl zU4C|8meN@!4X+IAPPp~!al*+$k~v`0=KLVC%!RJi1@#T@taPlVZA{gsqwRK5^-KN> zBYHxJ-ZiHxx$yQd!SzieGv{dPd9&)srXzYd%DGo0x>82b(+(ev>0p#Tp5Ed4tP^Lv zJ6BezB%r0Ixd>4#Dg!e$R9^C1ZLKR0rZl))-E ztZH!&VV$pSksZFw3MeR08E>c9-L5-8N{|bvcBi%M5%7`Yj)%)qsEfRGy227m1zv_w zN_P40lAvvXPi01b5flQf6OxH{zw2ih6Hq83NmRE$gj!A^n}Shwp6U_&x(8V4g@XMm z)xeZVn&JuVKU~#zrI@6RUr0NH^p!WX9Rn!!{`Q#=f6FFX<|yk!n~85TMvInA*my-B1H_EPlz5H@Gu3DS-c`oU*uk{1Q5)z8&xY-A`K zpr9H<)3SC_vq*5pW205aF<0zyl@m2XXF>X9Ei9i?^2Bip7By-$Kd8^VOde}p^5^28 zE>fmLlE&VUATYUW_rF4fe8CTPwAtG54fhl2b2#MLJJ{d1#CYC2RUVHUwd=QFV8}n0 z3|l*Ab3@ywE!Kp_JaBFj%af?|!CR-47qf!QW0R&Txw9M|b29*<*9&|OwFli0BV8;a z6Qbd@x4FrBwJ;3QR%{VvX|aDCFYUr4ve^jR7C#2n`PjXGimUj7Yq1?w-v^P=Nnfg{ zjU7k6{bf+xY^}qzXrPY7Yn7pvv%*VM}brrx)+dYNZ-Ip^rfciKKRmFamJey}J%E>DVZGC^@AD)Ml%4&Z9h%ca-NS9qR< zVN0beMU5t@$?$f%`z_qJ63rxwY|dU!3Dsb&Hur5)^Y`0lxP38t2bPwnZV}w748C!_ z34>v+bA5Z&h(~#7DE4ksC^4vQaE(&KPJ2xR^GsZKXD4|mo0>O!I$)#E(eTJQ-{>v{Wu2!(}(DZjH94=Hk2fXH!WC5xX zXLH=r$uET(l+s2$3&A9BQKd+ZOF&|gGOKJU-zJq#B0&O}gmhX5l!|^)Q!Qj{HK7Eo z=<2j$(Mqcozto@&1vpw{$VC~=>jf&#(j%p_SZl@TuBs$* zv_|pj^VxzJVj1`;nBdkw)z-D@4owY;Z}~(vO!Rft8S@z0EL7vkNkx#OkE!G|+#CO%>_yRf{1y!%wYu*aL;jLYYiBnMEM4J7(#>e_;Ao#lNm{aopq&zUK6?oWdH`5 zO>*}J0Ff$*;w&Xa47kkZhk_%04%Kd5D- zU}p==qfctIs~IBE@Y;wq!}2c)xpV;A)5Wg7NVxp_Wy?M00wf%}857Ra9|e>xdttzA z;3|rbbXiYDwAo+H7FTSXS)fe%?h)H@8L-tsYVR4tUzWxV#TGVpo9pr^x4L~gZ}oOP zZP)djdPZ9x>1`@FY&q&33&d%gD{@WnG|e8n^^fZp=ZB>9L5@&Gd34M<<~ z)9+hI8}Es!*oFG{9N1#!MKp``GrRz)5k&Pp3XoIi2w#x^aUlf9#VSP^*hNxQr&45o z_y%W4DaS~htUd5}L(e$m+KZHUkE6GHvVhfnSJdKaC4e`Ym zsS=>BC#Wp&NEn$AQVbpW0dKlIBn0ny4|LnRhbKkIW#jy)_6@=)R|>? z*(X`lMiU5vrtQvpCPYc?rP;<0L1SXR1Obhb<3&zeeQ@J_!fuCS@D^+aKTFFkLLgDz zN=wlcOM(_A!KtPrd3qBt&z$;@dy4)_9^j!KKxE=1ERdy1{+$p5`yRpBvoSwBm50;y zl<;_cf5dvZvzjtpw|M{{SanNaD2?lWH!;J%AMWYN<8pg=Tk&>??^4Lyl+Yh)Ixt>w zlRjIV-UaVDj?hc`>{x3h9X#R85D`RCl$;l1Z%We1xq*5s!>PPD^W5S92&zmkZIh2; ztYfDz){zSa$xALT?3#DKO|sA%jEHJv)}&HYJzQjsMr#9X#NQ56Z4MoXm!a3j3mlKM z^&($~4*>2$`1xLd9=;qc@=F**;hM{cXvfB9iz7cj1me?Y&sx*N%n$Osdf~-w^fDlY z%3sO{Y)Uwk!|6on`-7sbfJW0^VRBU@-p`8Y z==4eH^+Ey`keJ9DR}*t(q{GIq4#*yYKEJO41hxiEi}r_G|q z6r;1~=NCI(x>ADED}ojs3p&c{-blL>TxJaNhE$ki=8WLu=fAgd+d#v-JEHK^hv_1)%B)N+xE`s~QJdC+th_D5QoAWdW>_8}SS_pxY}uRz zosS>`%R{6;5j}V{nM3deAGq|_?FGiXR#@u>Mmb?i|Y?R zYK*_Q2rkG#mYm1h?dW6e_UZ0p(ZbeP*T&F5!Oq6S^8Jtfs(aL^DJBzUzyb6k36yT} zw?eJYv@8{H-%}Q9`2>>19rfQwk#K&B%@~oeo&w3!7Rr7qrVPrNP%GLCZyFpjxS$)T zrxU7nic3Ctu#Jjd1QzGQyR^lu%R^nN6@{Z=M26NG!(Qs{>`$oUn52{De!!${F_T&` za=MBtVI$tb;%XuADijO~=c3K2Cubq2RgI#~(Wxnrw#&r{vkznv!>|EqH4Do3L5oIe zpy}K!bYzq`Zwkk6Oj@Pon!6KZ6kIre;_D|oQx!K>3Lud@h8sJPQVUMuP!(k@lN&N8*)A#iiV%JtN+Ft4BBX)f=;gRk)f zuR6)7CH-tD!Dob4$pJ8rtj3CX@2dfL-!x}k7(W@pv#fWew-Nd+I^y#69cdD@4&8lP zIEq(Wu&AIH&x>4D98m5%k7;Ix)Udbbpn!Mxw?@J5CQ3K%8nDVDksiQ)fB#rw-+YJv z=+@rH56Z7RxlvRajLi3MS%;ebLX3@w{_o~3=)*a`+XAP4k2^X_p`TmuiDm} z_T;L0FQTIluPM>A#4|~Nhek1!l_Rs_gZ4qk*!dLPKa@a^IdMa^dR3GXks^TfHn5#7 ztl(&L0@jy3MGV3;a`SeYiYP;kO=4v~I|%+j+drcr0xuq$iC6rSY%Jr;O_xSY?3T7x ze*Bo+{X5!z?|03lHQp`h4tb>!ao1p~C53i(hy~S>2Fn)J0|A=%?>#W3UG)td8aFK% z^(6M6Sqn$V6C%78pYGY}vC{hDUtHsjtc#yK{QOEUnd3p|4D$c4{lPo}scmCu{%2|3 zmBXR&;qkx4#~4EVTZaBgvM6d;qJt5&>%iv#b-hX25esd`j)8Pn+Q8i_Ug}|l93x6~ zuL&e5M>}2*8)~@$+5hiJ7GbL~6Rpk1z*vQ$?GMZYjzNq;a#o&g10Qf9cB(vXr&#I~MIqBb1fq z>0F==a&3UI=J0R40s;$mhL(5}vV@0OXjT;?Q|!$@Vukv;WlcAup1p>F;T*QH=j%Uk zln5*=GNMC%t>GW95d3XTquH7^p<6?SD3~mL@Je88Y@@9;a#X#tUyRF-EOX}pz}(%j z8tcr*rY&Z3O!vj{|Htw_b<}@@bL}t_XYUcl`bRkN98IEexAE5#{1>{W?TkoW z2fiTRQFrUFVN9YaT3zW=MXq4_G@izKu#)OYHEBH=s_Axd8c1n=%?A|ybMtiv<0#~& z`i!y$oRmoP*X-jkP0tQc7}A3*4y!}Jkwe8wX$}smiKbO!CC4ivsjT4*(sc>7s>r8w zfK(xnFk6aDXR)ty)leo0EW%u(H-;bIC%tTz^UoIqW^X8D1Fb)~#Wku}}2CV6RC932FyAYhVR*%V^o=#-A2l4kjMaa<_51N4ao?s3UbI zBIU)0j}spcSW`usOL9HO0bN?J{ZVZGe57Xk{xP_b9}CV;oSV8Z(9+J((oS2^*~-vX z^C`%SV)|tu9@F*(c~g6~I*WppZm6!#vSB{pJLLFz3+riYs?XthDwPg|pm%7JIM?1) z^TRC&NtDJcm`r4RVWLp`Oa)xVC1<|Sh$uSlI29}2Pod2TmQ5Y9eDv_zlu;G7#ixK^ zvQV6g$11!WoTl^`9Dh*Cy^?g4amWePhTfwj8KT|@!hiMC&kp{b)q6@gKiktmfw33A6438P|4czoIzNqG z{H^mNWd4`2r{|5W?0y!K~5e{Rx#^;7Xk<^J22?avg4|d>-V`&!TwPF ziwpbx3Hg%^`(^R|pK8Cju|J3W=N9Hy2f>f4!sC$t3ETe~^b<4wvpsp(>ZgZ)&? k`JYVrlkQKiCI6T1FWy{M68cB5qCFlufqj&NB!1HSKMMQk{r~^~ literal 0 HcmV?d00001 From eae981d109610b5f829cc23bace922129ffabffd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 8 Nov 2021 14:25:54 +0800 Subject: [PATCH 22/30] mingzi --- .../epmet/project/dto/result/ProjectCategoryResultDTO.java | 5 +++++ .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java index 379257551f..4d1a418b59 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java @@ -33,6 +33,11 @@ public class ProjectCategoryResultDTO implements Serializable { */ private String categoryName; + /** + * 分类名字父级 + */ + private String parentCategoryName; + /** * 项目总数 */ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index f92fb1aade..b9dfb3faaa 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -99,6 +99,7 @@ +