From fee2c4547c823bf15359680ac9f770f591703eee Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Feb 2021 10:59:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E4=BA=8B=E4=BB=B6=E5=88=86?= =?UTF-8?q?=E6=9E=90-=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=88=86?= =?UTF-8?q?=E6=9E=90=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenProjectCategoryGridDailyDao.java | 31 ---- .../ScreenProjectCategoryOrgDailyDao.java | 32 ----- ...ScreenProjectCategoryGridDailyService.java | 29 ---- .../ScreenProjectCategoryOrgDailyService.java | 29 ---- ...enProjectCategoryGridDailyServiceImpl.java | 37 ----- ...eenProjectCategoryOrgDailyServiceImpl.java | 35 ----- .../ScreenProjectCategoryGridDailyDao.xml | 6 - .../ScreenProjectCategoryOrgDailyDao.xml | 8 -- .../ScreenProjectCategoryGridDailyDTO.java | 127 ----------------- .../ScreenProjectCategoryOrgDailyDTO.java | 132 ------------------ .../ScreenProjectDataCollController.java | 30 ---- .../ScreenProjectCategoryGridDailyDao.java | 40 ------ .../ScreenProjectCategoryOrgDailyDao.java | 41 ------ .../ScreenProjectCategoryGridDailyEntity.java | 93 ------------ .../ScreenProjectCategoryOrgDailyEntity.java | 98 ------------- ...ScreenProjectCategoryGridDailyService.java | 105 -------------- .../ScreenProjectCategoryOrgDailyService.java | 106 -------------- ...enProjectCategoryGridDailyServiceImpl.java | 127 ----------------- ...eenProjectCategoryOrgDailyServiceImpl.java | 127 ----------------- .../migration/V0.0.9__add_event_analysis.sql | 46 ------ .../ScreenProjectCategoryGridDailyDao.xml | 98 ------------- .../ScreenProjectCategoryOrgDailyDao.xml | 104 -------------- 22 files changed, 1481 deletions(-) delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryGridDailyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml delete mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java delete mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml delete mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java deleted file mode 100644 index e5d92af056..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java +++ /dev/null @@ -1,31 +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.epmet.datareport.dao.evaluationindex.screen; - -import org.apache.ibatis.annotations.Mapper; - -/** - * 项目(事件)分类按网格_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@Mapper -public interface ScreenProjectCategoryGridDailyDao{ - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java deleted file mode 100644 index c9403d83ad..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java +++ /dev/null @@ -1,32 +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.epmet.datareport.dao.evaluationindex.screen; - -import org.apache.ibatis.annotations.Mapper; - -/** - * 项目(事件)分类按组织_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@Mapper -public interface ScreenProjectCategoryOrgDailyDao { - - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java deleted file mode 100644 index 6fa3939479..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java +++ /dev/null @@ -1,29 +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.epmet.datareport.service.evaluationindex.screen; - -/** - * 项目(事件)分类按网格_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -public interface ScreenProjectCategoryGridDailyService{ - - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java deleted file mode 100644 index ea6bbd3bbc..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java +++ /dev/null @@ -1,29 +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.epmet.datareport.service.evaluationindex.screen; - - -/** - * 项目(事件)分类按组织_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -public interface ScreenProjectCategoryOrgDailyService{ - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java deleted file mode 100644 index 0aa3731bc9..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java +++ /dev/null @@ -1,37 +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.epmet.datareport.service.evaluationindex.screen.impl; - - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectCategoryGridDailyService; -import org.springframework.stereotype.Service; - -/** - * 项目(事件)分类按网格_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@DataSource(DataSourceConstant.EVALUATION_INDEX) -@Service -public class ScreenProjectCategoryGridDailyServiceImpl implements ScreenProjectCategoryGridDailyService { - - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java deleted file mode 100644 index 91ff2640b6..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java +++ /dev/null @@ -1,35 +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.epmet.datareport.service.evaluationindex.screen.impl; - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectCategoryOrgDailyService; -import org.springframework.stereotype.Service; - -/** - * 项目(事件)分类按组织_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@DataSource(DataSourceConstant.EVALUATION_INDEX) -@Service -public class ScreenProjectCategoryOrgDailyServiceImpl implements ScreenProjectCategoryOrgDailyService { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryGridDailyDao.xml deleted file mode 100644 index 8a78a2ce57..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryGridDailyDao.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file 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 deleted file mode 100644 index 10b3a02431..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java deleted file mode 100644 index 3124044699..0000000000 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.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.epmet.dto.screen; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 项目(事件)分类按网格_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@Data -public class ScreenProjectCategoryGridDailyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * 日期yyyyMMdd - */ - private String dateId; - - /** - * 网格id - */ - private String gridId; - - /** - * 网格所属的组织id - */ - private String pid; - - /** - * 网格所有的父级id,以英文:或者英文,隔开 - */ - private String pids; - - /** - * 类别编码 - */ - private String epmetCategoryCode; - - /** - * 该分类下所有项目总数 - */ - private Integer projectTotal; - - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 删除标识 - */ - 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/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java deleted file mode 100644 index 1cd31dd6cf..0000000000 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java +++ /dev/null @@ -1,132 +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.epmet.dto.screen; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 项目(事件)分类按组织_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@Data -public class ScreenProjectCategoryOrgDailyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * 日期yyyyMMdd - */ - private String dateId; - - /** - * 组织id - */ - private String orgId; - - /** - * 社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province - */ - private String orgType; - - /** - * 当前orgId所属的上级id - */ - private String pid; - - /** - * orgId所有的父级id,以英文:或者英文,隔开 - */ - private String pids; - - /** - * 类别编码 - */ - private String epmetCategoryCode; - - /** - * 该分类下所有项目总数 - */ - private Integer projectTotal; - - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 删除标识 - */ - 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/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java index 3d0754ac8f..f970bb9f03 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java @@ -25,10 +25,6 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("project") public class ScreenProjectDataCollController { - @Autowired - private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService; - @Autowired - private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService; @Autowired private ScreenProjectGridDailyService projectGridDailyService; @Autowired @@ -38,32 +34,6 @@ public class ScreenProjectDataCollController { @Autowired private ScreenProjectQuantityOrgMonthlyService projectQuantityOrgMonthlyService; - /** - * @author wangc - * @description 【事件/项目分析】按类别统计-网格 - **/ - @RequestMapping("category-grid-daily") - public Result categoryGridDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO param) { - if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) { - throw new ValidateException("参数错误:dataList不能为空且dataId不能为空"); - } - projectCategoryGridDailyService.collect(customerId, param); - return new Result(); - } - - /** - * @author wangc - * @description 【事件/项目分析】按类别统计-组织 - **/ - @RequestMapping("category-org-daily") - public Result categoryOrgDaily(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO param) { - if (null == param || CollectionUtils.isEmpty(param.getDataList()) || StringUtils.isBlank(param.getDateId())) { - throw new ValidateException("参数错误:dataList不能为空且dataId不能为空"); - } - projectCategoryOrgDailyService.collect(customerId, param); - return new Result(); - } - /** * @author wangc * @description 【事件/项目分析】网格内月度数量统计 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java deleted file mode 100644 index b17de4183e..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java +++ /dev/null @@ -1,40 +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.epmet.dao.evaluationindex.screen; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO; -import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 项目(事件)分类按网格_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@Mapper -public interface ScreenProjectCategoryGridDailyDao extends BaseDao { - - void insertBatch(@Param("list") List list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId); - - int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java deleted file mode 100644 index 64be263089..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java +++ /dev/null @@ -1,41 +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.epmet.dao.evaluationindex.screen; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO; -import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 项目(事件)分类按组织_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -@Mapper -public interface ScreenProjectCategoryOrgDailyDao extends BaseDao { - - void insertBatch(@Param("list") List list, @Param("customerId") String customerId, @Param("createdBy") String createdBy, @Param("timeId") String timeId); - - int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); - -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java deleted file mode 100644 index e26954c05e..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java +++ /dev/null @@ -1,93 +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.epmet.entity.evaluationindex.screen; - -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-01-27 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("screen_project_category_grid_daily") -public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 日期yyyyMMdd - */ - private String dateId; - - /** - * 网格id - */ - private String gridId; - - /** - * 网格所属的组织id - */ - private String pid; - - /** - * 网格所有的父级id,以英文:或者英文,隔开 - */ - private String pids; - - /** - * 类别编码 - */ - private String epmetCategoryCode; - - /** - * 该分类下所有项目总数 - */ - private Integer projectTotal; - - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java deleted file mode 100644 index 5137fc648c..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java +++ /dev/null @@ -1,98 +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.epmet.entity.evaluationindex.screen; - -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-01-27 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("screen_project_category_org_daily") -public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 日期yyyyMMdd - */ - private String dateId; - - /** - * 组织id - */ - private String orgId; - - /** - * 社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province - */ - private String orgType; - - /** - * 当前orgId所属的上级id - */ - private String pid; - - /** - * orgId所有的父级id,以英文:或者英文,隔开 - */ - private String pids; - - /** - * 类别编码 - */ - private String epmetCategoryCode; - - /** - * 该分类下所有项目总数 - */ - private Integer projectTotal; - - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java deleted file mode 100644 index 973386dac7..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java +++ /dev/null @@ -1,105 +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.epmet.service.evaluationindex.screen; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO; -import com.epmet.dto.screencoll.ScreenCollFormDTO; -import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity; - -import java.util.List; -import java.util.Map; - -/** - * 项目(事件)分类按网格_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -public interface ScreenProjectCategoryGridDailyService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-01-27 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2021-01-27 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ScreenProjectCategoryGridDailyDTO - * @author generator - * @date 2021-01-27 - */ - ScreenProjectCategoryGridDailyDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2021-01-27 - */ - void save(ScreenProjectCategoryGridDailyDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2021-01-27 - */ - void update(ScreenProjectCategoryGridDailyDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2021-01-27 - */ - void delete(String[] ids); - - /** - * @Description 数据录入 - * @param - * @return void - * @author wangc - * @date 2021.01.28 09:09 - */ - void collect(String customerId, ScreenCollFormDTO data); -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java deleted file mode 100644 index 2852987904..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java +++ /dev/null @@ -1,106 +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.epmet.service.evaluationindex.screen; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO; -import com.epmet.dto.screencoll.ScreenCollFormDTO; -import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity; - -import java.util.List; -import java.util.Map; - -/** - * 项目(事件)分类按组织_按天统计 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2021-01-27 - */ -public interface ScreenProjectCategoryOrgDailyService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2021-01-27 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2021-01-27 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ScreenProjectCategoryOrgDailyDTO - * @author generator - * @date 2021-01-27 - */ - ScreenProjectCategoryOrgDailyDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2021-01-27 - */ - void save(ScreenProjectCategoryOrgDailyDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2021-01-27 - */ - void update(ScreenProjectCategoryOrgDailyDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2021-01-27 - */ - void delete(String[] ids); - - /** - * @Description 数据采集 - * @param customerId - * @param data - * @return void - * @author wangc - * @date 2021.01.28 09:33 - */ - void collect(String customerId, ScreenCollFormDTO data); -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java deleted file mode 100644 index 3b67c5f73d..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.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.epmet.service.evaluationindex.screen.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao; -import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO; -import com.epmet.dto.screencoll.ScreenCollFormDTO; -import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity; -import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryGridDailyService; -import com.google.common.collect.Lists; -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-01-27 - */ -@Service -public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl implements ScreenProjectCategoryGridDailyService { - - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ScreenProjectCategoryGridDailyDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ScreenProjectCategoryGridDailyDTO.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 ScreenProjectCategoryGridDailyDTO get(String id) { - ScreenProjectCategoryGridDailyEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ScreenProjectCategoryGridDailyDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ScreenProjectCategoryGridDailyDTO dto) { - ScreenProjectCategoryGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenProjectCategoryGridDailyEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ScreenProjectCategoryGridDailyDTO dto) { - ScreenProjectCategoryGridDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenProjectCategoryGridDailyEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @Description 数据录入 - * @param - * @return void - * @author wangc - * @date 2021.01.28 09:09 - */ - @Transactional(rollbackFor = Exception.class) - @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) - @Override - public void collect(String customerId, ScreenCollFormDTO data) { - if(data.getIsFirst()){ - int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); - while(affectedRows > 0){ - affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); - } - } - Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> { - baseDao.insertBatch(list,customerId,"APP_USER",data.getDateId()); - }); - } - -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java deleted file mode 100644 index a2d79822aa..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.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.epmet.service.evaluationindex.screen.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao; -import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO; -import com.epmet.dto.screencoll.ScreenCollFormDTO; -import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity; -import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryOrgDailyService; -import com.google.common.collect.Lists; -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-01-27 - */ -@Service -public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl implements ScreenProjectCategoryOrgDailyService { - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ScreenProjectCategoryOrgDailyDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ScreenProjectCategoryOrgDailyDTO.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 ScreenProjectCategoryOrgDailyDTO get(String id) { - ScreenProjectCategoryOrgDailyEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ScreenProjectCategoryOrgDailyDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ScreenProjectCategoryOrgDailyDTO dto) { - ScreenProjectCategoryOrgDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenProjectCategoryOrgDailyEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ScreenProjectCategoryOrgDailyDTO dto) { - ScreenProjectCategoryOrgDailyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenProjectCategoryOrgDailyEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @Description 数据采集 - * @param customerId - * @param data - * @return void - * @author wangc - * @date 2021.01.28 09:33 - */ - @Transactional(rollbackFor = Exception.class) - @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) - @Override - public void collect(String customerId, ScreenCollFormDTO data) { - if(data.getIsFirst()){ - int affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); - while(affectedRows > 0){ - affectedRows = baseDao.deleteByDateIdAndCustomerId(customerId,data.getDateId()); - } - } - Lists.partition(data.getDataList(), NumConstant.ONE_HUNDRED).forEach(list -> { - baseDao.insertBatch(list,customerId,"APP_USER",data.getDateId()); - }); - } - -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql index b2c2e623f2..2ee65f59c2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.9__add_event_analysis.sql @@ -97,49 +97,3 @@ CREATE TABLE `screen_project_quantity_org_monthly` ( PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目(事件)数量分析按组织_按月统计'; -drop table if EXISTS screen_project_category_grid_daily; -CREATE TABLE `screen_project_category_grid_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `DATE_ID` varchar(8) NOT NULL COMMENT '日期yyyyMMdd', - `GRID_ID` varchar(64) NOT NULL COMMENT '网格id', - `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id', - `PIDS` varchar(255) NOT NULL COMMENT '网格所有的父级id,以英文:或者英文,隔开', - `EPMET_CATEGORY_CODE` varchar(255) NOT NULL COMMENT 'e世通中的项目类别编码', - `PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下所有项目总数', - `PENDING_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下，正在处理中的项目总数', - `CLOSED_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下已结案的项目总数', - `UN_RESOLVED_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下已结案无需解决的项目总数', - `RESOLVED_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下已结案已解决的项目总数', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', - `REVISION` int(10) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目(事件)分类按网格_按天统计'; - -drop table if EXISTS screen_project_category_org_daily; -CREATE TABLE `screen_project_category_org_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `DATE_ID` varchar(8) NOT NULL COMMENT '日期yyyyMMdd', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织id', - `ORG_TYPE` varchar(64) NOT NULL COMMENT '社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province', - `PID` varchar(64) NOT NULL COMMENT '当前orgId所属的上级id', - `PIDS` varchar(255) NOT NULL COMMENT 'orgId所有的父级id,以英文:或者英文,隔开', - `EPMET_CATEGORY_CODE` varchar(255) NOT NULL COMMENT 'e世通中的项目类别编码', - `PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下所有项目总数', - `PENDING_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下，正在处理中的项目总数', - `CLOSED_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下已结案的项目总数', - `UN_RESOLVED_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下已结案无需解决的项目总数', - `RESOLVED_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '该分类下已结案已解决的项目总数', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', - `REVISION` int(10) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目(事件)分类按组织_按天统计'; \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml deleted file mode 100644 index 307d11d50d..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO screen_project_category_grid_daily - ( - id, - customer_id, - date_id, - grid_id, - pid, - pids, - epmet_category_code, - project_total, - pending_total, - closed_total, - un_resolved_total, - resolved_total, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - ) values - - ( - (SELECT REPLACE(UUID(), '-', '') AS id), - - #{customerId}, - - #{timeId}, - - #{item.gridId}, - - #{item.pid}, - - #{item.pids}, - - #{item.epmetCategoryCode}, - - #{item.projectTotal}, - - #{item.pendingTotal}, - - #{item.closedTotal}, - - #{item.unResolvedTotal}, - - #{item.resolvedTotal}, - - '0', - - 0, - - #{createdBy}, - - now(), - - #{createdBy}, - - now() - ) - - - - - - delete from screen_project_category_grid_daily - where customer_id = #{customerId} - and date_id = #{dateId} - limit 1000 - - - \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml deleted file mode 100644 index 512e0c6e66..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO screen_project_category_org_daily - ( - id, - customer_id, - date_id, - org_id, - org_type, - pid, - pids, - epmet_category_code, - project_total, - pending_total, - closed_total, - un_resolved_total, - resolved_total, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - ) values - - ( - (SELECT REPLACE(UUID(), '-', '') AS id), - - #{customerId}, - - #{timeId}, - - #{item.orgId}, - - #{item.orgType}, - - #{item.pid}, - - #{item.pids}, - - #{item.epmetCategoryCode}, - - #{item.projectTotal}, - - #{item.pendingTotal}, - - #{item.closedTotal}, - - #{item.unResolvedTotal}, - - #{item.resolvedTotal}, - - '0', - - 0, - - #{createdBy}, - - now(), - - #{createdBy}, - - now() - ) - - - - - - delete from screen_project_category_org_daily - where customer_id = #{customerId} - and date_id = #{dateId} - limit 1000 - - - - - \ No newline at end of file