From d408613f3c0b7d328c5c1b0aedc57cce4a5a140c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 25 Aug 2021 10:34:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GridOpeningJobController.java | 94 +++++++++++++ .../controller/UserAnalysisController.java | 41 ++++-- .../modules/user/dao/GridOpeningJobDao.java | 41 ++++++ .../modules/user/dao/UserAnalysisDao.java | 9 +- .../user/entity/GridOpeningJobEntity.java | 133 ++++++++++++++++++ .../user/excel/GridOpeningJobExcel.java | 110 +++++++++++++++ .../user/redis/GridOpeningJobRedis.java | 47 +++++++ .../user/service/GridOpeningJobService.java | 96 +++++++++++++ .../user/service/UserAnalysisService.java | 18 +++ .../impl/GridOpeningJobServiceImpl.java | 104 ++++++++++++++ .../service/impl/UserAnalysisServiceImpl.java | 48 ++++++- .../mapper/user/GridOpeningJobDao.xml | 38 +++++ .../resources/mapper/user/UserAnalysisDao.xml | 12 +- 13 files changed, 774 insertions(+), 17 deletions(-) create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java create mode 100644 epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java create mode 100644 epdc-cloud-analysis-pc/src/main/resources/mapper/user/GridOpeningJobDao.xml diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java new file mode 100644 index 0000000..fc7841d --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/GridOpeningJobController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.analysis.pc.user.GridOpeningJobDTO; +import com.elink.esua.epdc.modules.user.excel.GridOpeningJobExcel; +import com.elink.esua.epdc.modules.user.service.GridOpeningJobService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@RestController +@RequestMapping("gridopeningjob") +public class GridOpeningJobController { + + @Autowired + private GridOpeningJobService gridOpeningJobService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = gridOpeningJobService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GridOpeningJobDTO data = gridOpeningJobService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GridOpeningJobDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + gridOpeningJobService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GridOpeningJobDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + gridOpeningJobService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + gridOpeningJobService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = gridOpeningJobService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, GridOpeningJobExcel.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java index 021798b..5158925 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java @@ -6,29 +6,23 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.result.*; -import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.GridOpeningResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.OldMemberRankResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.UserDataRankResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.excel.ExportOperationDataExcel; import com.elink.esua.epdc.excel.GridOpiningExcel; +import com.elink.esua.epdc.excel.PartyAnalysExcel; +import com.elink.esua.epdc.excel.RegisterExcel; import com.elink.esua.epdc.modules.user.service.OldMemberRankService; +import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.elink.esua.epdc.excel.PartyAnalysExcel; -import com.elink.esua.epdc.excel.RegisterExcel; -import com.elink.esua.epdc.modules.user.service.UserAnalysisService; -import java.util.HashMap; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; - /** * 数据端，用户数据分析相关接口 * @@ -90,6 +84,19 @@ public class UserAnalysisController { return new Result>().ok(page); } + /*** + * 开通网格分页-无条件 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/2/11 16:01 + */ + @GetMapping("pageGridOpeningWithout") + public Result> pageGridOpeningWithout(@RequestParam Map params) { + PageData page = userAnalysisService.pageGridOpeningWithout(params); + return new Result>().ok(page); + } + /** * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Description 党员老龄化列表 @@ -213,4 +220,16 @@ public class UserAnalysisController { List list = userAnalysisService.listExportOperationCount(exportOperationFormDTO); ExcelUtils.exportExcelToTarget(response, "开通网格情况", list, ExportOperationDataExcel.class); } + + /** + * @describe: 定时任务-网格开通情况 + * @author wangtong + * @date 2021/8/24 13:42 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("gridOpeningJob") + public void gridOpeningJob() { + userAnalysisService.gridOpeningJob(); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java new file mode 100644 index 0000000..e9f680f --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/GridOpeningJobDao.java @@ -0,0 +1,41 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Mapper +public interface GridOpeningJobDao extends BaseDao { + + /** + * @describe: 删除所有数据 + * @author wangtong + * @date 2021/8/24 16:46 + * @params [] + * @return void + */ + void deleteAllInfo(); +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 6c3a4c9..fa81e0b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -270,5 +270,12 @@ public interface UserAnalysisDao extends BaseMapper { */ List selectExportEnterpriseCountByGridId(Map params); - + /** + * @describe: 开通网格分页-无条件 + * @author wangtong + * @date 2021/8/24 17:05 + * @params [params] + * @return java.util.List + */ + List pageGridOpeningWithout(Map params); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java new file mode 100644 index 0000000..1305128 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/entity/GridOpeningJobEntity.java @@ -0,0 +1,133 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_grid_opening_job") +public class GridOpeningJobEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 网格id + */ + private String gridId; + + /** + * 街道社区网格 + */ + private String allDeptName; + + /** + * 用户注册数 + */ + private Integer registerCount; + + /** + * 居民数（包括认证成功和党员认证失败的居民） + */ + private Integer residentCount; + + /** + * 认证党员数 + */ + private Integer partyCount; + + /** + * 未认证用户（根据用户第一次扫码的网格统计） + */ + private Integer unAuthorizedCount; + + /** + * 居民扫码数 + */ + private Integer ewmCount; + + /** + * 新闻数 + */ + private Integer newsCount; + + /** + * 通知数 + */ + private Integer noticeCount; + + /** + * 议题数 + */ + private Integer eventCount; + + /** + * 项目数 + */ + private Integer itemCount; + + /** + * 项目解决数 + */ + private Integer itemCloseCount; + + /** + * 项目好评数（满意度评价为非常满意） + */ + private Integer itemPraiseCount; + + /** + * 社群数 + */ + private Integer communityCount; + + /** + * 社群成员数 + */ + private Integer communityMemberCount; + + /** + * 社群话题数 + */ + private Integer communityTopicCount; + + /** + * 企业数 + */ + private Integer enterpriseCount; + + /** + * 网格长姓名 + */ + private String gridLeader; + + /** + * 所有网格id + */ + private String allDeptIds; + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java new file mode 100644 index 0000000..6ffa55f --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/excel/GridOpeningJobExcel.java @@ -0,0 +1,110 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Data +public class GridOpeningJobExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "网格id") + private String gridid; + + @Excel(name = "街道社区网格") + private String alldeptname; + + @Excel(name = "用户注册数") + private Integer registercount; + + @Excel(name = "居民数（包括认证成功和党员认证失败的居民）") + private Integer residentcount; + + @Excel(name = "认证党员数") + private Integer partycount; + + @Excel(name = "未认证用户（根据用户第一次扫码的网格统计）") + private Integer unauthorizedcount; + + @Excel(name = "居民扫码数") + private Integer ewmcount; + + @Excel(name = "新闻数") + private Integer newscount; + + @Excel(name = "通知数") + private Integer noticecount; + + @Excel(name = "议题数") + private Integer eventcount; + + @Excel(name = "项目数") + private Integer itemcount; + + @Excel(name = "项目解决数") + private Integer itemclosecount; + + @Excel(name = "项目好评数（满意度评价为非常满意）") + private Integer itempraisecount; + + @Excel(name = "社群数") + private Integer communitycount; + + @Excel(name = "社群成员数") + private Integer communitymembercount; + + @Excel(name = "社群话题数") + private Integer communitytopiccount; + + @Excel(name = "企业数") + private Integer enterprisecount; + + @Excel(name = "网格长姓名") + private String gridleader; + + @Excel(name = "所有网格id") + private String alldeptids; + + @Excel(name = "删除标记(0-否，1-是)") + private String delFlag; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java new file mode 100644 index 0000000..eb6993a --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/redis/GridOpeningJobRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Component +public class GridOpeningJobRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java new file mode 100644 index 0000000..e239039 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/GridOpeningJobService.java @@ -0,0 +1,96 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.service; + + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.analysis.pc.user.GridOpeningJobDTO; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; + +import java.util.List; +import java.util.Map; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +public interface GridOpeningJobService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-24 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-24 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GridOpeningJobDTO + * @author generator + * @date 2021-08-24 + */ + GridOpeningJobDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-24 + */ + void save(GridOpeningJobDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-24 + */ + void update(GridOpeningJobDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-24 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java index f12c789..0a749d5 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java @@ -124,4 +124,22 @@ public interface UserAnalysisService { * @date 2020/3/26 13:32 */ List getToLeadUserRegisterRandData(Map params); + + /** + * @describe: 定时任务-网格开通情况 + * @author wangtong + * @date 2021/8/24 13:56 + * @params [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + void gridOpeningJob( ); + + /*** + * 开通网格分页-无条件 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/2/11 16:01 + */ + PageData pageGridOpeningWithout(Map params); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java new file mode 100644 index 0000000..1cd9b68 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/GridOpeningJobServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.user.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.dto.analysis.pc.user.GridOpeningJobDTO; +import com.elink.esua.epdc.modules.user.dao.GridOpeningJobDao; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; +import com.elink.esua.epdc.modules.user.redis.GridOpeningJobRedis; +import com.elink.esua.epdc.modules.user.service.GridOpeningJobService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 网格排名情况 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-24 + */ +@Service +public class GridOpeningJobServiceImpl extends BaseServiceImpl implements GridOpeningJobService { + + @Autowired + private GridOpeningJobRedis gridOpeningJobRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GridOpeningJobDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GridOpeningJobDTO.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 GridOpeningJobDTO get(String id) { + GridOpeningJobEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GridOpeningJobDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GridOpeningJobDTO dto) { + GridOpeningJobEntity entity = ConvertUtils.sourceToTarget(dto, GridOpeningJobEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GridOpeningJobDTO dto) { + GridOpeningJobEntity entity = ConvertUtils.sourceToTarget(dto, GridOpeningJobEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index 702a49e..ceb7d0a 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -9,24 +9,28 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.analysis.pc.user.UserAnalysisDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.ExportOperationFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.form.UserCountDTO; +import com.elink.esua.epdc.dto.analysis.pc.user.form.UserSortRankFormDTO; import com.elink.esua.epdc.dto.analysis.pc.user.result.*; +import com.elink.esua.epdc.modules.user.dao.GridOpeningJobDao; import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao; +import com.elink.esua.epdc.modules.user.entity.GridOpeningJobEntity; +import com.elink.esua.epdc.modules.user.service.GridOpeningJobService; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 用户数据分析业务实现 @@ -38,6 +42,12 @@ import java.util.Map; @Service public class UserAnalysisServiceImpl extends BaseServiceImpl implements UserAnalysisService { + @Autowired + private GridOpeningJobService gridOpeningJobService; + + @Autowired + private GridOpeningJobDao gridOpeningJobDao; + @Override public PageData listPageGridOpening(Map params) { params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); @@ -45,6 +55,18 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl list = baseDao.selectListGridHasMaCode(params); list = fillFieldForGridOpening(list, params); + list = list.stream().sorted(Comparator.comparing(GridOpeningResultDTO::getRegisterCount) + .thenComparing(GridOpeningResultDTO::getPartyCount).reversed()).collect(Collectors.toList()); + + PageData page = new PageData<>(list, iPage.getTotal()); + return page; + } + + @Override + public PageData pageGridOpeningWithout(Map params) { + IPage iPage = this.getPage(params); + + List list = baseDao.pageGridOpeningWithout(params); PageData page = new PageData<>(list, iPage.getTotal()); return page; @@ -401,5 +423,23 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl params = new HashMap(); + params.put("category","1");//已开通网格 + List list = baseDao.selectListGridHasMaCode(params); + + list = fillFieldForGridOpening(list, params); + + List entityList = ConvertUtils.sourceToTarget(list, GridOpeningJobEntity.class); + + gridOpeningJobService.insertBatch(entityList); + } + + + } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/GridOpeningJobDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/GridOpeningJobDao.xml new file mode 100644 index 0000000..adb9dc4 --- /dev/null +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/GridOpeningJobDao.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from epdc_grid_opening_job + + + + \ No newline at end of file diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml index 0d3e715..64b63dc 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -391,7 +391,8 @@ SELECT ad.id gridId, CONCAT( ad2.`name`, '-', ad1.`name`, '-', ad.`name` ) AS allDeptName, - GROUP_CONCAT( DISTINCT u.real_name ) gridLeader + GROUP_CONCAT( DISTINCT u.real_name ) gridLeader, + concat(ad.pids,',',ad.id) as allDeptIds FROM LEFT JOIN .epdc_dept_ma_code ama ON ad.id = ama.GRID_ID AND ama.DEL_FLAG = '0' @@ -1276,4 +1277,13 @@ ORDER BY t0.id ASC + From 16b1654d440bc8835d3c444ddb85c022612454ba Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 25 Aug 2021 12:10:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E7=96=AB=E6=83=85=E5=8F=8A=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?typeKey=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/screen/controller/EpdcScreenController.java | 5 +++-- .../esua/epdc/modules/screen/dao/EpdcScreenDao.java | 2 +- .../epdc/modules/screen/service/EpdcScreenService.java | 2 +- .../screen/service/impl/EpdcScreenServiceImpl.java | 4 ++-- .../src/main/resources/mapper/screen/EpdcScreenDao.xml | 9 +++++++++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 75678e4..babe906 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -210,8 +210,9 @@ public class EpdcScreenController { * @since 2021/8/12 10:10 */ @GetMapping("epidemic/vaccinationStatistics") - public Result epidemicVaccinationStatistics(){ - return epdcScreenService.epidemicVaccinationStatistics(); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.epidemicVaccinationStatistics(formDto); } /** diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 0837227..528aed2 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -150,7 +150,7 @@ public interface EpdcScreenDao extends BaseDao epidemicVaccinationStatistics(); + Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto); /** * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index c7693f0..214cb72 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -120,8 +120,8 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl epidemicVaccinationStatistics() { - EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics(); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics(formDto); return new Result().ok(data); } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 9901eb2..3457337 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -311,6 +311,9 @@ SUM(NOT_VACCINATED_NUM) as notVaccinatedNum FROM esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' + + AND TYPE_KEY = #{typeKey} + + SELECT + IFNULL(t1.topicNum, 0) topicNum, + IFNULL(t1.topicAddedYesterdayNum, 0) topicAddedYesterdayNum, + IFNULL(t2.issueNum, 0) issueNum, + IFNULL(t2.issueAddedYesterdayNum, 0) issueAddedYesterdayNum, + IFNULL(t3.itemNum, 0) itemNum, + IFNULL(t3.itemAddedYesterdayNum, 0) itemAddedYesterdayNum, + IFNULL(t3.itemCaseClosedNum, 0) itemCaseClosedNum, + IFNULL(t3.itemCaseClosedAddedYesterdayNum, 0) itemCaseClosedAddedYesterdayNum + FROM + ( + SELECT + COUNT( t.ID ) AS topicNum, + SUM( + DATE_FORMAT( DATE_SUB( CURDATE(), INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( t.CREATED_TIME, '%Y-%m-%d' )) AS topicAddedYesterdayNum + FROM + yushan_esua_epdc_group.epdc_topic t + WHERE + t.DEL_FLAG = '0' + + AND find_in_set(#{formDto.deptId}, t.ALL_DEPT_IDS) + + AND t.GRID_ID IN + + #{id} + ) t1, + ( + SELECT + COUNT( issue.ID ) AS issueNum, + SUM( + DATE_FORMAT( DATE_SUB( CURDATE(), INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' )) AS issueAddedYesterdayNum + FROM + yushan_esua_epdc_events.epdc_issue issue + WHERE + issue.DEL_FLAG = '0' + + AND find_in_set(#{formDto.deptId}, issue.ALL_DEPT_IDS) + + AND issue.GRID_ID IN + + #{id} + + ) t2, + ( + SELECT + COUNT( item.ID ) AS itemNum, + SUM( + DATE_FORMAT( DATE_SUB( CURDATE(), INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' )) AS itemAddedYesterdayNum, + SUM( item.ITEM_STATE = 10 ) AS itemCaseClosedNum, + SUM( + DATE_FORMAT( DATE_SUB( CURDATE(), INTERVAL 1 DAY ), '%Y-%m-%d' ) = DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) + AND item.ITEM_STATE = 10 + ) AS itemCaseClosedAddedYesterdayNum + FROM + yushan_esua_epdc_events.epdc_item item + WHERE + item.DEL_FLAG = '0' + + AND find_in_set(#{formDto.deptId}, item.ALL_DEPT_IDS) + + AND item.GRID_ID IN + + #{id} + + ) t3 + + + diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 3457337..75d67fe 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -27,9 +27,9 @@ i.DISTRIBUTE_TIME, IFNULL(e.APPROVE_NUM + e.OPPOSE_NUM + e.COMMENT_NUM, 0) AS attentionNum FROM - esua_epdc_events.epdc_item i - LEFT JOIN esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE - LEFT JOIN esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID + yushan_esua_epdc_events.epdc_item i + LEFT JOIN yushan_esua_epdc_events.epdc_category c ON c.CATEGORY_CODE = i.CATEGORY_CODE + LEFT JOIN yushan_esua_epdc_events.epdc_events e ON e.ID = i.EVENT_ID WHERE i.DEL_FLAG = '0' ORDER BY @@ -45,13 +45,13 @@ ec.CATEGORY_NAME, t.itemNum FROM - esua_epdc_analysis.meta_epdc_category ec + yushan_esua_epdc_analysis.meta_epdc_category ec LEFT JOIN ( SELECT c.CATEGORY_NAME, IFNULL( SUM( c.ITEM_TOTLE ), 0 ) itemNum FROM - esua_epdc_analysis.epdc_issue_item_category c + yushan_esua_epdc_analysis.epdc_issue_item_category c WHERE c.CATEGORY_TYPE = '1' GROUP BY @@ -69,7 +69,7 @@ IFNULL(SUM(ITEM_STATE = 0), 0) AS processingNum, IFNULL(SUM(ITEM_STATE = 5 OR ITEM_STATE = 10), 0) AS completedNum FROM - esua_epdc_events.epdc_item + yushan_esua_epdc_events.epdc_item WHERE DEL_FLAG = '0' @@ -83,8 +83,8 @@ di.HANDLE_TOTAL, di.DEPT_TOTAL FROM - esua_epdc_analysis.epdc_difficult_item di, - esua_epdc_analysis.epdc_item_difficult_config dc + yushan_esua_epdc_analysis.epdc_difficult_item di, + yushan_esua_epdc_analysis.epdc_item_difficult_config dc WHERE di.DEL_FLAG = '0' AND ( @@ -115,7 +115,7 @@ SATISFACTION_RATE, AUTONOMY_RATE FROM - esua_epdc_analysis.epdc_screen_governance_ranking + yushan_esua_epdc_analysis.epdc_screen_governance_ranking WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -137,8 +137,8 @@ n.CREATED_TIME, n.TOP_FLAG FROM - esua_epdc_news.epdc_notice n - LEFT JOIN esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID + yushan_esua_epdc_news.epdc_notice n + LEFT JOIN yushan_esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID WHERE n.DEL_FLAG = '0' AND n.NOTICE_RELEASE_STATE = '1' @@ -161,8 +161,8 @@ IFNULL( a.ACT_SHYK_PERSON_NUM, 0 ) AS actShykPersonNum, IFNULL( a.ACT_LJGJ_PERSON_NUM, 0 ) AS actLjgjPersonNum FROM - esua_epdc_admin.sys_dept d - LEFT JOIN esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id + yushan_esua_epdc_admin.sys_dept d + LEFT JOIN yushan_esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id AND a.DEL_FLAG = '0' WHERE d.del_flag = 0 @@ -186,8 +186,8 @@ ot.IMG_URL, COUNT( po.ID ) AS partyOrgNum FROM - esua_epdc_admin.epdc_party_org_type ot - LEFT JOIN esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE + yushan_esua_epdc_admin.epdc_party_org_type ot + LEFT JOIN yushan_esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE AND po.DEL_FLAG = '0' WHERE ot.DEL_FLAG = '0' @@ -210,8 +210,8 @@ po.TYPE_CODE, pot.IMG_URL FROM - esua_epdc_admin.epdc_party_org po - LEFT JOIN esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE + yushan_esua_epdc_admin.epdc_party_org po + LEFT JOIN yushan_esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE WHERE po.DEL_FLAG = '0' AND @@ -229,8 +229,8 @@ ui.PROMISE, ui.SERVICE_AREA FROM - esua_epdc_user.epdc_user_info ui - LEFT JOIN esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID + yushan_esua_epdc_user.epdc_user_info ui + LEFT JOIN yushan_esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID WHERE ui.DEL_FLAG = '0' AND ui.RECOMMEND_FLAG = '1' @@ -249,7 +249,7 @@ IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy, IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy FROM - esua_epdc_analysis.epdc_screen_party_member_age_statistics + yushan_esua_epdc_analysis.epdc_screen_party_member_age_statistics WHERE DEL_FLAG = '0' @@ -269,9 +269,9 @@ sdi.ACREAGE AS acreage, edi.IMG_URL AS imgUrl, edi.IMG_TYPE AS imgType - FROM esua_epdc_admin.sys_dept_info sdi - LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID - LEFT JOIN esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID + FROM yushan_esua_epdc_admin.sys_dept_info sdi + LEFT JOIN yushan_esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID + LEFT JOIN yushan_esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID WHERE sd.del_flag = '0' AND sdi.DEL_FLAG = '0' AND edi.DEL_FLAG = '0' @@ -286,7 +286,7 @@ sum(if(LIVE_TYPE='0',PERSON_NUM,0)) as permanentResidenceNum, sum(if(LIVE_TYPE='1',PERSON_NUM,0)) as floatingPopulationNum, sum(if(LIVE_TYPE='2',PERSON_NUM,0)) as overseasPopulationNum - FROM esua_epdc_analysis.epdc_screen_person_live_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_person_live_statistics WHERE DEL_FLAG = '0' @@ -298,7 +298,7 @@ sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum, sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum, sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum - FROM esua_epdc_analysis.epdc_screen_house_type_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_house_type_statistics WHERE DEL_FLAG = '0' @@ -309,7 +309,7 @@ SUM(ONE_SHOT_NUM) as oneShotNum, SUM(TWO_SHOTS_NUM) as twoShotsNum, SUM(NOT_VACCINATED_NUM) as notVaccinatedNum - FROM esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' AND TYPE_KEY = #{typeKey} @@ -329,7 +329,7 @@ BEING_VACCINATED_NUM, LONGITUDE, LATITUDE - FROM esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' ORDER BY @@ -353,7 +353,7 @@ SELECT COMPANY, SUM(VACCINATION_NUM) AS vaccinationNum - FROM esua_epdc_analysis.epdc_screen_vaccination_company_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_company_statistics WHERE DEL_FLAG = '0' GROUP BY COMPANY @@ -368,7 +368,7 @@ SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty, SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty, SUM(AGE_OVER_SIXTY) AS ageOverSixty - FROM esua_epdc_analysis.epdc_screen_vaccination_age_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_age_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -382,7 +382,7 @@ SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum, SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum, SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum - FROM esua_epdc_analysis.epdc_screen_vaccination_person_statistics + FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_person_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -398,14 +398,14 @@ (SELECT GROUP_CONCAT(r.STAFF_NAME) FROM - esua_epdc_admin.sys_user u - LEFT JOIN esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0' + yushan_esua_epdc_admin.sys_user u + LEFT JOIN yushan_esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0' WHERE u.del_flag = 0 AND u.dept_id = i.GRID_ID ORDER BY r.CREATED_TIME) AS gridMan FROM - esua_epdc_events.epdc_item i + yushan_esua_epdc_events.epdc_item i WHERE i.DEL_FLAG = '0' @@ -439,9 +439,9 @@ itemDept.DEPT_NAME, img.IMG_URL FROM - esua_epdc_events.epdc_item_handle_process hp - LEFT JOIN esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID - LEFT JOIN esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID + yushan_esua_epdc_events.epdc_item_handle_process hp + LEFT JOIN yushan_esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID + LEFT JOIN yushan_esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID AND IMG_TYPE = 'itemHandle' AND img.DEL_FLAG = '0' WHERE @@ -462,7 +462,7 @@ NULL AS DEPT_NAME, NULL AS IMG_URL FROM - esua_epdc_events.epdc_item item + yushan_esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' AND item.ID = #{id} @@ -472,7 +472,7 @@ @@ -83,8 +83,8 @@ di.HANDLE_TOTAL, di.DEPT_TOTAL FROM - yushan_esua_epdc_analysis.epdc_difficult_item di, - yushan_esua_epdc_analysis.epdc_item_difficult_config dc + esua_epdc_analysis.epdc_difficult_item di, + esua_epdc_analysis.epdc_item_difficult_config dc WHERE di.DEL_FLAG = '0' AND ( @@ -115,7 +115,7 @@ SATISFACTION_RATE, AUTONOMY_RATE FROM - yushan_esua_epdc_analysis.epdc_screen_governance_ranking + esua_epdc_analysis.epdc_screen_governance_ranking WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -137,8 +137,8 @@ n.CREATED_TIME, n.TOP_FLAG FROM - yushan_esua_epdc_news.epdc_notice n - LEFT JOIN yushan_esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID + esua_epdc_news.epdc_notice n + LEFT JOIN esua_epdc_news.epdc_module_type t ON t.id = n.TYPE_ID WHERE n.DEL_FLAG = '0' AND n.NOTICE_RELEASE_STATE = '1' @@ -161,8 +161,8 @@ IFNULL( a.ACT_SHYK_PERSON_NUM, 0 ) AS actShykPersonNum, IFNULL( a.ACT_LJGJ_PERSON_NUM, 0 ) AS actLjgjPersonNum FROM - yushan_esua_epdc_admin.sys_dept d - LEFT JOIN yushan_esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id + esua_epdc_admin.sys_dept d + LEFT JOIN esua_epdc_analysis.epdc_screen_community_act_statistics a ON a.DEPT_ID = d.id AND a.DEL_FLAG = '0' WHERE d.del_flag = 0 @@ -186,8 +186,8 @@ ot.IMG_URL, COUNT( po.ID ) AS partyOrgNum FROM - yushan_esua_epdc_admin.epdc_party_org_type ot - LEFT JOIN yushan_esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE + esua_epdc_admin.epdc_party_org_type ot + LEFT JOIN esua_epdc_admin.epdc_party_org po ON po.TYPE_CODE = ot.TYPE_CODE AND po.DEL_FLAG = '0' WHERE ot.DEL_FLAG = '0' @@ -210,8 +210,8 @@ po.TYPE_CODE, pot.IMG_URL FROM - yushan_esua_epdc_admin.epdc_party_org po - LEFT JOIN yushan_esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE + esua_epdc_admin.epdc_party_org po + LEFT JOIN esua_epdc_admin.epdc_party_org_type pot ON po.TYPE_CODE = pot.TYPE_CODE WHERE po.DEL_FLAG = '0' AND @@ -229,8 +229,8 @@ ui.PROMISE, ui.SERVICE_AREA FROM - yushan_esua_epdc_user.epdc_user_info ui - LEFT JOIN yushan_esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID + esua_epdc_user.epdc_user_info ui + LEFT JOIN esua_epdc_user.epdc_user u ON u.ID = ui.USER_ID WHERE ui.DEL_FLAG = '0' AND ui.RECOMMEND_FLAG = '1' @@ -249,7 +249,7 @@ IFNULL(SUM( AGE_SIXTY_ONE_SEVENTY ), 0) AS ageSixtyOneSeventy, IFNULL(SUM( AGE_OVER_SEVENTY ), 0) AS ageOverSeventy FROM - yushan_esua_epdc_analysis.epdc_screen_party_member_age_statistics + esua_epdc_analysis.epdc_screen_party_member_age_statistics WHERE DEL_FLAG = '0' @@ -269,9 +269,9 @@ sdi.ACREAGE AS acreage, edi.IMG_URL AS imgUrl, edi.IMG_TYPE AS imgType - FROM yushan_esua_epdc_admin.sys_dept_info sdi - LEFT JOIN yushan_esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID - LEFT JOIN yushan_esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID + FROM esua_epdc_admin.sys_dept_info sdi + LEFT JOIN esua_epdc_admin.sys_dept sd ON sd.ID = sdi.DEPT_ID + LEFT JOIN esua_epdc_admin.epdc_admin_img edi ON edi.REFERENCE_ID = sdi.DEPT_ID WHERE sd.del_flag = '0' AND sdi.DEL_FLAG = '0' AND edi.DEL_FLAG = '0' @@ -286,7 +286,7 @@ sum(if(LIVE_TYPE='0',PERSON_NUM,0)) as permanentResidenceNum, sum(if(LIVE_TYPE='1',PERSON_NUM,0)) as floatingPopulationNum, sum(if(LIVE_TYPE='2',PERSON_NUM,0)) as overseasPopulationNum - FROM yushan_esua_epdc_analysis.epdc_screen_person_live_statistics + FROM esua_epdc_analysis.epdc_screen_person_live_statistics WHERE DEL_FLAG = '0' @@ -298,7 +298,7 @@ sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum, sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum, sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum - FROM yushan_esua_epdc_analysis.epdc_screen_house_type_statistics + FROM esua_epdc_analysis.epdc_screen_house_type_statistics WHERE DEL_FLAG = '0' @@ -309,7 +309,7 @@ SUM(ONE_SHOT_NUM) as oneShotNum, SUM(TWO_SHOTS_NUM) as twoShotsNum, SUM(NOT_VACCINATED_NUM) as notVaccinatedNum - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' AND TYPE_KEY = #{typeKey} @@ -329,7 +329,7 @@ BEING_VACCINATED_NUM, LONGITUDE, LATITUDE - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_statistics WHERE DEL_FLAG = '0' ORDER BY @@ -353,7 +353,7 @@ SELECT COMPANY, SUM(VACCINATION_NUM) AS vaccinationNum - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_company_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_company_statistics WHERE DEL_FLAG = '0' GROUP BY COMPANY @@ -368,7 +368,7 @@ SUM(AGE_FORTY_ONE_FIFTY) AS ageFortyOneFifty, SUM(AGE_FIFTY_ONE_SIXTY) AS ageFiftyOneSixty, SUM(AGE_OVER_SIXTY) AS ageOverSixty - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_age_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_age_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -382,7 +382,7 @@ SUM(PERMANENT_RESIDENCE_NUM) AS permanentResidenceNum, SUM(FLOATING_POPULATION_NUM) AS floatingPopulationNum, SUM(FOREIGN_POPULATION_NUM) AS foreignPopulationNum - FROM yushan_esua_epdc_analysis.epdc_screen_vaccination_person_statistics + FROM esua_epdc_analysis.epdc_screen_vaccination_person_statistics WHERE DEL_FLAG = '0' AND STATISTIC_TYPE = #{statisticType} @@ -398,14 +398,14 @@ (SELECT GROUP_CONCAT(r.STAFF_NAME) FROM - yushan_esua_epdc_admin.sys_user u - LEFT JOIN yushan_esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0' + esua_epdc_admin.sys_user u + LEFT JOIN esua_epdc_admin.sys_epmet_user_relation r ON r.SYS_USER_ID = u.id AND r.DEL_FLAG = '0' WHERE u.del_flag = 0 AND u.dept_id = i.GRID_ID ORDER BY r.CREATED_TIME) AS gridMan FROM - yushan_esua_epdc_events.epdc_item i + esua_epdc_events.epdc_item i WHERE i.DEL_FLAG = '0' @@ -439,9 +439,9 @@ itemDept.DEPT_NAME, img.IMG_URL FROM - yushan_esua_epdc_events.epdc_item_handle_process hp - LEFT JOIN yushan_esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID - LEFT JOIN yushan_esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID + esua_epdc_events.epdc_item_handle_process hp + LEFT JOIN esua_epdc_events.epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID + LEFT JOIN esua_epdc_events.epdc_img img ON hp.ID = img.REFERENCE_ID AND IMG_TYPE = 'itemHandle' AND img.DEL_FLAG = '0' WHERE @@ -462,7 +462,7 @@ NULL AS DEPT_NAME, NULL AS IMG_URL FROM - yushan_esua_epdc_events.epdc_item item + esua_epdc_events.epdc_item item WHERE item.DEL_FLAG = '0' AND item.ID = #{id} @@ -472,7 +472,7 @@