From ea995d0d0a4fabc17faddf3b8b453978351780a3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 18:02:19 +0800 Subject: [PATCH 01/51] ggg --- .../main/java/com/epmet/dto/IcWorkLogDTO.java | 104 ++++++++++++++++++ .../java/com/epmet/dto/IcWorkLogFileDTO.java | 84 ++++++++++++++ .../epmet/controller/IcWorkLogController.java | 82 ++++++++++++++ .../controller/IcWorkLogFileController.java | 82 ++++++++++++++ .../main/java/com/epmet/dao/IcWorkLogDao.java | 16 +++ .../java/com/epmet/dao/IcWorkLogFileDao.java | 16 +++ .../com/epmet/entity/IcWorkLogEntity.java | 74 +++++++++++++ .../com/epmet/entity/IcWorkLogFileEntity.java | 54 +++++++++ .../java/com/epmet/excel/IcWorkLogExcel.java | 69 ++++++++++++ .../com/epmet/excel/IcWorkLogFileExcel.java | 57 ++++++++++ .../com/epmet/redis/IcWorkLogFileRedis.java | 30 +++++ .../java/com/epmet/redis/IcWorkLogRedis.java | 30 +++++ .../epmet/service/IcWorkLogFileService.java | 78 +++++++++++++ .../com/epmet/service/IcWorkLogService.java | 78 +++++++++++++ .../impl/IcWorkLogFileServiceImpl.java | 87 +++++++++++++++ .../service/impl/IcWorkLogServiceImpl.java | 87 +++++++++++++++ .../main/resources/mapper/IcWorkLogDao.xml | 27 +++++ .../resources/mapper/IcWorkLogFileDao.xml | 23 ++++ 18 files changed, 1078 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogFileController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogFileEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogFileExcel.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogFileRedis.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogRedis.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java new file mode 100644 index 0000000000..2289b460d2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java @@ -0,0 +1,104 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 网格员工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Data +public class IcWorkLogDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * agency_id的所有上级 + */ + private String pids; + + /** + * 网格Id【场所区域】 + */ + private String gridId; + + /** + * 标题 + */ + private String title; + + /** + * 日志类型【admin库sys_dict_data表value值】 + */ + private String logType; + + /** + * 日志日期 + */ + private String logDate; + + /** + * 内容 + */ + private String content; + + /** + * 备注 + */ + private String remark; + + /** + * 手机 + */ + private String mobile; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer 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/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java new file mode 100644 index 0000000000..cfd15e4364 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java @@ -0,0 +1,84 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 网格员工作日志附件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Data +public class IcWorkLogFileDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 日志Id + */ + private String logId; + + /** + * 地址 + */ + private String url; + + /** + * 文件名 + */ + private String fileName; + + /** + * 文件类型，0图片 + */ + private String fileType; + + /** + * 内容 + */ + private Integer sort; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer 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/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java new file mode 100644 index 0000000000..85b598337b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcWorkLogDTO; +import com.epmet.excel.IcWorkLogExcel; +import com.epmet.service.IcWorkLogService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@RestController +@RequestMapping("icWorkLog") +public class IcWorkLogController { + + @Autowired + private IcWorkLogService icWorkLogService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icWorkLogService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcWorkLogDTO data = icWorkLogService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcWorkLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icWorkLogService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcWorkLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icWorkLogService.update(dto); + return new Result(); + } + + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icWorkLogService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icWorkLogService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogExcel.class); + } + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogFileController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogFileController.java new file mode 100644 index 0000000000..65881f1876 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogFileController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcWorkLogFileDTO; +import com.epmet.excel.IcWorkLogFileExcel; +import com.epmet.service.IcWorkLogFileService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@RestController +@RequestMapping("icWorkLogFile") +public class IcWorkLogFileController { + + @Autowired + private IcWorkLogFileService icWorkLogFileService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icWorkLogFileService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcWorkLogFileDTO data = icWorkLogFileService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcWorkLogFileDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icWorkLogFileService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcWorkLogFileDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icWorkLogFileService.update(dto); + return new Result(); + } + + @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE}) + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icWorkLogFileService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = icWorkLogFileService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogFileExcel.class); + } + + + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java new file mode 100644 index 0000000000..c1ce556739 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcWorkLogEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 网格员工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Mapper +public interface IcWorkLogDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java new file mode 100644 index 0000000000..88828adcc4 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcWorkLogFileEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 网格员工作日志附件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Mapper +public interface IcWorkLogFileDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java new file mode 100644 index 0000000000..9bd1f47dc5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java @@ -0,0 +1,74 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 网格员工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_work_log") +public class IcWorkLogEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * agency_id的所有上级 + */ + private String pids; + + /** + * 网格Id【场所区域】 + */ + private String gridId; + + /** + * 标题 + */ + private String title; + + /** + * 日志类型【admin库sys_dict_data表value值】 + */ + private String logType; + + /** + * 日志日期 + */ + private String logDate; + + /** + * 内容 + */ + private String content; + + /** + * 备注 + */ + private String remark; + + /** + * 手机 + */ + private String mobile; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogFileEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogFileEntity.java new file mode 100644 index 0000000000..361672c822 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogFileEntity.java @@ -0,0 +1,54 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 网格员工作日志附件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_work_log_file") +public class IcWorkLogFileEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 日志Id + */ + private String logId; + + /** + * 地址 + */ + private String url; + + /** + * 文件名 + */ + private String fileName; + + /** + * 文件类型，0图片 + */ + private String fileType; + + /** + * 内容 + */ + private Integer sort; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java new file mode 100644 index 0000000000..f7a8073f36 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -0,0 +1,69 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 网格员工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Data +public class IcWorkLogExcel { + + @Excel(name = "唯一标识") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "组织Id") + private String agencyId; + + @Excel(name = "agency_id的所有上级") + private String pids; + + @Excel(name = "网格Id【场所区域】") + private String gridId; + + @Excel(name = "标题") + private String title; + + @Excel(name = "日志类型【admin库sys_dict_data表value值】") + private String logType; + + @Excel(name = "日志日期") + private String logDate; + + @Excel(name = "内容") + private String content; + + @Excel(name = "备注") + private String remark; + + @Excel(name = "手机") + private String mobile; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogFileExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogFileExcel.java new file mode 100644 index 0000000000..cd03a4d193 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogFileExcel.java @@ -0,0 +1,57 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 网格员工作日志附件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Data +public class IcWorkLogFileExcel { + + @Excel(name = "唯一标识") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "日志Id") + private String logId; + + @Excel(name = "地址") + private String url; + + @Excel(name = "文件名") + private String fileName; + + @Excel(name = "文件类型，0图片") + private String fileType; + + @Excel(name = "内容") + private Integer sort; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogFileRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogFileRedis.java new file mode 100644 index 0000000000..16a455e7bc --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogFileRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 网格员工作日志附件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Component +public class IcWorkLogFileRedis { + @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/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogRedis.java new file mode 100644 index 0000000000..fbada49154 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/IcWorkLogRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 网格员工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Component +public class IcWorkLogRedis { + @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/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java new file mode 100644 index 0000000000..fb51be3aeb --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcWorkLogFileDTO; +import com.epmet.entity.IcWorkLogFileEntity; + +import java.util.List; +import java.util.Map; + +/** + * 网格员工作日志附件 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +public interface IcWorkLogFileService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-05 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-05 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcWorkLogFileDTO + * @author generator + * @date 2022-08-05 + */ + IcWorkLogFileDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-05 + */ + void save(IcWorkLogFileDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-05 + */ + void update(IcWorkLogFileDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-05 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java new file mode 100644 index 0000000000..680adbfbde --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcWorkLogDTO; +import com.epmet.entity.IcWorkLogEntity; + +import java.util.List; +import java.util.Map; + +/** + * 网格员工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +public interface IcWorkLogService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-05 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-05 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcWorkLogDTO + * @author generator + * @date 2022-08-05 + */ + IcWorkLogDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-05 + */ + void save(IcWorkLogDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-05 + */ + void update(IcWorkLogDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-05 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java new file mode 100644 index 0000000000..4309859e91 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcWorkLogFileDao; +import com.epmet.dto.IcWorkLogFileDTO; +import com.epmet.entity.IcWorkLogFileEntity; +import com.epmet.redis.IcWorkLogFileRedis; +import com.epmet.service.IcWorkLogFileService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Service +public class IcWorkLogFileServiceImpl extends BaseServiceImpl implements IcWorkLogFileService { + + @Autowired + private IcWorkLogFileRedis icWorkLogFileRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcWorkLogFileDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcWorkLogFileDTO.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 IcWorkLogFileDTO get(String id) { + IcWorkLogFileEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcWorkLogFileDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcWorkLogFileDTO dto) { + IcWorkLogFileEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogFileEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcWorkLogFileDTO dto) { + IcWorkLogFileEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogFileEntity.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/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java new file mode 100644 index 0000000000..6055950060 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcWorkLogDao; +import com.epmet.dto.IcWorkLogDTO; +import com.epmet.entity.IcWorkLogEntity; +import com.epmet.redis.IcWorkLogRedis; +import com.epmet.service.IcWorkLogService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-08-05 + */ +@Service +public class IcWorkLogServiceImpl extends BaseServiceImpl implements IcWorkLogService { + + @Autowired + private IcWorkLogRedis icWorkLogRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcWorkLogDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcWorkLogDTO.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 IcWorkLogDTO get(String id) { + IcWorkLogEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcWorkLogDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcWorkLogDTO dto) { + IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcWorkLogDTO dto) { + IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.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/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml new file mode 100644 index 0000000000..e286087e4b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml new file mode 100644 index 0000000000..23ab1afedd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 6bcca8cb4d810dc0988fafbd4ed5a032db9c3f0d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 14:29:49 +0800 Subject: [PATCH 02/51] ddd --- .../main/java/com/epmet/dto/IcWorkLogDTO.java | 5 +++ .../epmet/controller/IcWorkLogController.java | 6 ++++ .../main/java/com/epmet/dao/IcWorkLogDao.java | 7 +++- .../service/impl/IcWorkLogServiceImpl.java | 33 ++++++++++++++++--- .../main/resources/mapper/IcWorkLogDao.xml | 30 +++++++++++++++++ 5 files changed, 75 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java index 2289b460d2..4a936d7acd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java @@ -101,4 +101,9 @@ public class IcWorkLogDTO implements Serializable { */ private Date updatedTime; + /** + * 创建人名称 + */ + private String createdUser; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java index 85b598337b..910b345827 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ExcelUtils; @@ -74,6 +75,11 @@ public class IcWorkLogController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = icWorkLogService.list(params); + if(CollectionUtils.isEmpty(list)){ + IcWorkLogDTO dto = new IcWorkLogDTO(); + dto.setId(""); + list.add(dto); + } ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogExcel.class); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java index c1ce556739..108d0b4e25 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcWorkLogDTO; import com.epmet.entity.IcWorkLogEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 网格员工作日志 * @@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcWorkLogDao extends BaseDao { - + + List listPage(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 6055950060..3b5895655f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -1,14 +1,22 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcWorkLogDao; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IcWorkLogDTO; +import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.IcWorkLogEntity; +import com.epmet.feign.EpmetUserFeignClient; import com.epmet.redis.IcWorkLogRedis; import com.epmet.service.IcWorkLogService; import org.apache.commons.lang3.StringUtils; @@ -32,12 +40,18 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + IPage page = getPage(params); + List list = baseDao.listPage(params); return getPageData(page, IcWorkLogDTO.class); } @@ -66,6 +80,15 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam); + if (!staffInfo.success() || null == staffInfo.getData()) { + logger.warn(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO))); + } else { + currentUserName = resultUserInfo.getData().getShowName(); + } IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); insert(entity); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index e286087e4b..01a1e0b0f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -24,4 +24,34 @@ + \ No newline at end of file From 741e15b7d139388602013317cd07bb6c6623303b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 14:39:13 +0800 Subject: [PATCH 03/51] bug --- .../java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 3b5895655f..9adc7be604 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -85,9 +86,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam); if (!staffInfo.success() || null == staffInfo.getData()) { - logger.warn(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO))); + throw new EpmetException("查询用户信息失败"+ JSON.toJSONString(customerStaffParam)); } else { - currentUserName = resultUserInfo.getData().getShowName(); + dto.setCreatedUser(staffInfo.getData().getRealName()); } IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); insert(entity); From 8d888d3940f9bb7da56277545dec71149948ea59 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 15:01:58 +0800 Subject: [PATCH 04/51] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcWorkLogServiceImpl.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 9adc7be604..da064b3f6a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -5,17 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.CustomerGridDao; import com.epmet.dao.IcWorkLogDao; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IcWorkLogDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; -import com.epmet.dto.result.UserResiInfoResultDTO; +import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.result.GridDetailResultDTO; import com.epmet.entity.IcWorkLogEntity; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.redis.IcWorkLogRedis; @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -47,6 +48,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl page(Map params) { @@ -63,8 +67,8 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + 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); @@ -86,9 +90,17 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam); if (!staffInfo.success() || null == staffInfo.getData()) { - throw new EpmetException("查询用户信息失败"+ JSON.toJSONString(customerStaffParam)); + throw new EpmetException("查询用户信息失败" + JSON.toJSONString(customerStaffParam)); } else { dto.setCreatedUser(staffInfo.getData().getRealName()); + dto.setMobile(staffInfo.getData().getMobile()); + } + CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO(); + customerGridFormDTO.setGridId(dto.getGridId()); + GridDetailResultDTO gridDetailResultDTO = customerGridDao.griddetail(customerGridFormDTO); + if (gridDetailResultDTO != null) { + dto.setAgencyId(gridDetailResultDTO.getAgencyId()); + dto.setPids(gridDetailResultDTO.getPIds()); } IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); insert(entity); From 85643b0daaa994f77f4a4f81cc37c6a1d2e0a77a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 15:10:42 +0800 Subject: [PATCH 05/51] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcWorkLogController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java index 910b345827..3e4ed95219 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java @@ -47,7 +47,7 @@ public class IcWorkLogController { } @NoRepeatSubmit - @PostMapping("save") + @PostMapping public Result save(@RequestBody IcWorkLogDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -56,7 +56,7 @@ public class IcWorkLogController { } @NoRepeatSubmit - @PostMapping("update") + @PutMapping public Result update(@RequestBody IcWorkLogDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); From 559cb71db0534dde682da8034a24fec9ac8bd2b1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 15:21:40 +0800 Subject: [PATCH 06/51] bug --- .../src/main/java/com/epmet/entity/IcWorkLogEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java index 9bd1f47dc5..1a7b7596be 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcWorkLogEntity.java @@ -71,4 +71,9 @@ public class IcWorkLogEntity extends BaseEpmetEntity { */ private String mobile; + /** + * 创建人名称 + */ + private String createdUser; + } From 15952e24e48257df3c73108dd5088abc483b2916 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 15:41:41 +0800 Subject: [PATCH 07/51] bug --- .../main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index da064b3f6a..d48aec4613 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -57,7 +57,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl page = getPage(params); List list = baseDao.listPage(params); - return getPageData(page, IcWorkLogDTO.class); + return new PageData<>(list, page.getTotal()); } @Override From 8ffccb9d5ee5754d5407c75ade8f27e0aafd0516 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 17:09:24 +0800 Subject: [PATCH 08/51] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcWorkLogDTO.java | 7 +++++ .../impl/IcWorkLogFileServiceImpl.java | 2 ++ .../service/impl/IcWorkLogServiceImpl.java | 26 ++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java index 4a936d7acd..47fbe32b91 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java @@ -2,6 +2,8 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -106,4 +108,9 @@ public class IcWorkLogDTO implements Serializable { */ private String createdUser; + /** + * 附件 + */ + private List fileList; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java index 4309859e91..3f5ecacca8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java @@ -50,9 +50,11 @@ public class IcWorkLogFileServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String logId = (String)params.get("logId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(logId), "LOG_ID", logId); return wrapper; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index d48aec4613..7433da4673 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; @@ -14,11 +15,14 @@ import com.epmet.dao.CustomerGridDao; import com.epmet.dao.IcWorkLogDao; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IcWorkLogDTO; +import com.epmet.dto.IcWorkLogFileDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.result.GridDetailResultDTO; import com.epmet.entity.IcWorkLogEntity; +import com.epmet.entity.IcWorkLogFileEntity; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.redis.IcWorkLogRedis; +import com.epmet.service.IcWorkLogFileService; import com.epmet.service.IcWorkLogService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +50,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl params = new HashMap<>(2); + params.put("logId", id); + List files = icWorkLogFileService.list(params); + dto.setFileList(files); + return dto; } @Override @@ -104,6 +117,17 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl { + item.setLogId(entity.getId()); + item.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + item.setFileType(NumConstant.ZERO_STR); + }); + + List fileEntityList = ConvertUtils.sourceToTarget(dto.getFileList(), IcWorkLogFileEntity.class); + icWorkLogFileService.insertBatch(fileEntityList); + } } @Override From edaae5330ae01aada2187266256b1cbcc49ca655 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 17:25:37 +0800 Subject: [PATCH 09/51] =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcWorkLogFileDTO.java | 5 +++++ .../java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 1 + 2 files changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java index cfd15e4364..c7529b3b5a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogFileDTO.java @@ -41,6 +41,11 @@ public class IcWorkLogFileDTO implements Serializable { */ private String fileName; + /** + * 文件名 + */ + private String name; + /** * 文件类型，0图片 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 7433da4673..9aad5c5890 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -91,6 +91,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl params = new HashMap<>(2); params.put("logId", id); List files = icWorkLogFileService.list(params); + files.forEach(item->item.setName(item.getFileName())); dto.setFileList(files); return dto; } From 8211995f2f7ac2364288b6a2e22e8f09b0b6b869 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Aug 2022 17:47:16 +0800 Subject: [PATCH 10/51] =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcWorkLogFileDao.java | 12 ++++++- .../epmet/service/IcWorkLogFileService.java | 10 ++++++ .../impl/IcWorkLogFileServiceImpl.java | 6 ++++ .../service/impl/IcWorkLogServiceImpl.java | 31 ++++++++++++------- .../resources/mapper/IcWorkLogFileDao.xml | 7 +++++ 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java index 88828adcc4..3165b1039d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogFileDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcWorkLogFileEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 网格员工作日志附件 @@ -12,5 +13,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcWorkLogFileDao extends BaseDao { - + + /** + * 删除 + * + * @param logId + * @return void + * @author generator + * @date 2022-08-05 + */ + void deleteByLogId(@Param("logId") String logId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java index fb51be3aeb..b5813982cd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogFileService.java @@ -75,4 +75,14 @@ public interface IcWorkLogFileService extends BaseService { * @date 2022-08-05 */ void delete(String[] ids); + + /** + * 删除 + * + * @param logId + * @return void + * @author generator + * @date 2022-08-05 + */ + void deleteByLogId(String logId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java index 3f5ecacca8..eac5f28c73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogFileServiceImpl.java @@ -86,4 +86,10 @@ public class IcWorkLogFileServiceImpl extends BaseServiceImpl params = new HashMap<>(2); params.put("logId", id); List files = icWorkLogFileService.list(params); - files.forEach(item->item.setName(item.getFileName())); + files.forEach(item -> item.setName(item.getFileName())); dto.setFileList(files); return dto; } @@ -119,16 +119,8 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl { - item.setLogId(entity.getId()); - item.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - item.setFileType(NumConstant.ZERO_STR); - }); - - List fileEntityList = ConvertUtils.sourceToTarget(dto.getFileList(), IcWorkLogFileEntity.class); - icWorkLogFileService.insertBatch(fileEntityList); - } + // 处理附件 + fileHandle(dto.getFileList(), entity.getId()); } @Override @@ -136,6 +128,10 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl fileList, String logId) { + if (!fileList.isEmpty()) { + fileList.forEach(item -> { + item.setLogId(logId); + item.setCustomerId(loginUserUtil.getLoginUserCustomerId()); + item.setFileType(NumConstant.ZERO_STR); + }); + + List fileEntityList = ConvertUtils.sourceToTarget(fileList, IcWorkLogFileEntity.class); + icWorkLogFileService.insertBatch(fileEntityList); + } + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml index 23ab1afedd..7461622a6e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogFileDao.xml @@ -20,4 +20,11 @@ + + DELETE + FROM + ic_work_log_file + WHERE + LOG_ID = #{logId} + \ No newline at end of file From 73b8e29da62d3c8d2bc0ee318a75a07ecacb7e06 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 09:13:03 +0800 Subject: [PATCH 11/51] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/DictTypeEnum.java | 1 + .../main/java/com/epmet/dto/IcWorkLogDTO.java | 10 ++++ .../epmet/controller/IcWorkLogController.java | 2 +- .../main/java/com/epmet/dao/IcWorkLogDao.java | 2 + .../java/com/epmet/excel/IcWorkLogExcel.java | 50 ++++++------------- .../com/epmet/service/IcWorkLogService.java | 10 ++++ .../service/impl/IcWorkLogServiceImpl.java | 19 +++++++ .../main/resources/mapper/IcWorkLogDao.xml | 45 +++++++++++++++++ 8 files changed, 102 insertions(+), 37 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index e900f79875..07d47ba7b0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -28,6 +28,7 @@ public enum DictTypeEnum { IC_SERVICE_TYPE("ic_service_type","服务类别",20), IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), + LOG_TYPE("log_type", "日志类型", 33), ; private final String code; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java index 47fbe32b91..37b2d58b88 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java @@ -33,6 +33,11 @@ public class IcWorkLogDTO implements Serializable { */ private String agencyId; + /** + * 组织Id + */ + private String allAgencyName; + /** * agency_id的所有上级 */ @@ -43,6 +48,11 @@ public class IcWorkLogDTO implements Serializable { */ private String gridId; + /** + * 网格Id【场所区域】 + */ + private String gridName; + /** * 标题 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java index 3e4ed95219..21c0f918fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java @@ -74,7 +74,7 @@ public class IcWorkLogController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = icWorkLogService.list(params); + List list = icWorkLogService.list4Export(params); if(CollectionUtils.isEmpty(list)){ IcWorkLogDTO dto = new IcWorkLogDTO(); dto.setId(""); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java index 108d0b4e25..c1a8bfb5f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java @@ -18,4 +18,6 @@ import java.util.Map; public interface IcWorkLogDao extends BaseDao { List listPage(Map params); + + List list4Export(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index f7a8073f36..3b58d200b8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -14,56 +14,34 @@ import java.util.Date; @Data public class IcWorkLogExcel { - @Excel(name = "唯一标识") - private String id; + @Excel(name = "网格员") + private String createdUser; - @Excel(name = "客户Id") - private String customerId; - - @Excel(name = "组织Id") - private String agencyId; + @Excel(name = "联系电话") + private String mobile; - @Excel(name = "agency_id的所有上级") - private String pids; + @Excel(name = "所属镇街") + private String allAgencyName; - @Excel(name = "网格Id【场所区域】") - private String gridId; + @Excel(name = "所属网格") + private String gridName; @Excel(name = "标题") private String title; - @Excel(name = "日志类型【admin库sys_dict_data表value值】") - private String logType; - - @Excel(name = "日志日期") + @Excel(name = "日志时间") private String logDate; + @Excel(name = "日志类型") + private String logType; + @Excel(name = "内容") private String content; @Excel(name = "备注") private String remark; - @Excel(name = "手机") - private String mobile; - - @Excel(name = "删除标识：0.未删除 1.已删除") - private Integer delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - + @Excel(name = "照片") + private String url; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java index 680adbfbde..d8c435a64a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcWorkLogService.java @@ -36,6 +36,16 @@ public interface IcWorkLogService extends BaseService { */ List list(Map params); + /** + * 查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-05 + */ + List list4Export(Map params); + /** * 单条查询 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 3424b10cec..4d355b0c6a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; @@ -20,6 +21,7 @@ import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.result.GridDetailResultDTO; import com.epmet.entity.IcWorkLogEntity; import com.epmet.entity.IcWorkLogFileEntity; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.redis.IcWorkLogRedis; import com.epmet.service.IcWorkLogFileService; @@ -56,6 +58,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl list4Export(Map params) { + List list = baseDao.list4Export(params) + Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode()); + if (!result.success() || null == result.getData()) { + throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); + } else { + Map logTypeMap = result.getData(); + list.forEach(item -> item.setLogType(logTypeMap.get(item.getLogType()))); + } + + return list; + } + private QueryWrapper getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 01a1e0b0f7..063f8b1969 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -54,4 +54,49 @@ AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) <= #{endTime} + + \ No newline at end of file From 4f1507e3ec31609031c9f38ac3fc286ff6a7359c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 09:18:05 +0800 Subject: [PATCH 12/51] bug --- .../main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 4d355b0c6a..764e81167f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -82,7 +82,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl list4Export(Map params) { - List list = baseDao.list4Export(params) + List list = baseDao.list4Export(params); Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode()); if (!result.success() || null == result.getData()) { throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); From 379b5de228cc15932e345939fb1d14249294db16 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 09:26:57 +0800 Subject: [PATCH 13/51] bug --- .../main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 764e81167f..d010231a2b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -82,6 +82,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl list4Export(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); List list = baseDao.list4Export(params); Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode()); if (!result.success() || null == result.getData()) { From 9000b5fc05bc70fb195088c483f3bebb225e02fb Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 09:37:26 +0800 Subject: [PATCH 14/51] bug --- .../src/main/java/com/epmet/dto/IcWorkLogDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java index 37b2d58b88..3e14c72b1d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java @@ -118,6 +118,11 @@ public class IcWorkLogDTO implements Serializable { */ private String createdUser; + /** + * url + */ + private String url; + /** * 附件 */ From 9447f08b10a3189540d0a69c31a2a00b230b0bfe Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 10:12:16 +0800 Subject: [PATCH 15/51] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcWorkLogServiceImpl.java | 2 ++ .../src/main/resources/mapper/IcWorkLogDao.xml | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index d010231a2b..e4881ebf1e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -68,6 +68,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl page(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + params.put("createdBy", loginUserUtil.getLoginUserId()); IPage page = getPage(params); List list = baseDao.listPage(params); return new PageData<>(list, page.getTotal()); @@ -83,6 +84,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl list4Export(Map params) { params.put("customerId", loginUserUtil.getLoginUserCustomerId()); + params.put("createdBy", loginUserUtil.getLoginUserId()); List list = baseDao.list4Export(params); Result> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode()); if (!result.success() || null == result.getData()) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 063f8b1969..50120b91b5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -42,11 +42,14 @@ AND wl.GRID_ID = #{gridId} - AND wl.AGENCY_ID = #{agencyId} + AND FIND_IN_SET( #{agencyId}, wl.pids ) AND wl.MOBILE = #{mobile} + + AND wl.CREATED_BY = #{createdBy} + AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime} @@ -85,11 +88,14 @@ AND wl.GRID_ID = #{gridId} - AND wl.AGENCY_ID = #{agencyId} + AND FIND_IN_SET( #{agencyId}, wl.pids ) AND wl.MOBILE = #{mobile} + + AND wl.CREATED_BY = #{createdBy} + AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime} From 65fb771d8be98506830b30a93dce81c9129cff34 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 10:27:26 +0800 Subject: [PATCH 16/51] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcWorkLogDao.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 50120b91b5..7ed4f50e21 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -42,7 +42,8 @@ AND wl.GRID_ID = #{gridId} - AND FIND_IN_SET( #{agencyId}, wl.pids ) + AND (wl.AGENCY_ID = #{agencyId} + OR wl.PIDS LIKE concat('%',#{agencyId}, '%' )) AND wl.MOBILE = #{mobile} @@ -88,7 +89,8 @@ AND wl.GRID_ID = #{gridId} - AND FIND_IN_SET( #{agencyId}, wl.pids ) + AND (wl.AGENCY_ID = #{agencyId} + OR wl.PIDS LIKE concat('%',#{agencyId}, '%' )) AND wl.MOBILE = #{mobile} From ee8c9e2fc026d4e066c16dd5dbd99ef5ef4bd485 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 10:43:34 +0800 Subject: [PATCH 17/51] flayway --- .../db/migration/V0.0.42__add_work_log.sql | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql new file mode 100644 index 0000000000..611985c76e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql @@ -0,0 +1,67 @@ +/* + Navicat Premium Data Transfer + + Source Server : epmet_cloud_dev_gov + Source Server Type : MySQL + Source Server Version : 50726 + Source Host : 192.168.1.140:3306 + Source Schema : epmet_gov_org + + Target Server Type : MySQL + Target Server Version : 50726 + File Encoding : 65001 + + Date: 09/08/2022 10:41:08 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for ic_work_log +-- ---------------------------- +DROP TABLE IF EXISTS `ic_work_log`; +CREATE TABLE `ic_work_log` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织Id', + `PIDS` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'agency_id的所有上级', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格Id【场所区域】', + `TITLE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', + `LOG_TYPE` char(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '日志类型【admin库sys_dict_data表value值】', + `LOG_DATE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '日志日期', + `CONTENT` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容', + `REMARK` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `MOBILE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `CREATED_USER` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人名称', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网格员工作日志' ROW_FORMAT = COMPACT; + +-- ---------------------------- +-- Table structure for ic_work_log_file +-- ---------------------------- +DROP TABLE IF EXISTS `ic_work_log_file`; +CREATE TABLE `ic_work_log_file` ( + `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户Id', + `LOG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '日志Id', + `URL` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '地址', + `FILE_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名', + `FILE_TYPE` char(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '文件类型，0图片', + `SORT` int(11) NOT NULL DEFAULT 0 COMMENT '内容', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识：0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网格员工作日志附件' ROW_FORMAT = COMPACT; + +SET FOREIGN_KEY_CHECKS = 1; From 8b482e436bd714c1e8e1d3529ba4b7ed6019e3e9 Mon Sep 17 00:00:00 2001 From: syc Date: Tue, 9 Aug 2022 13:35:23 +0800 Subject: [PATCH 18/51] =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/PartymemberRegisterRelationDTO.java | 10 ++++++++++ .../entity/PartymemberRegisterRelationEntity.java | 10 ++++++++++ .../main/java/com/epmet/dto/RegisterRelationDTO.java | 10 ++++++++++ .../java/com/epmet/entity/RegisterRelationEntity.java | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java index 35ebdcbb38..c2716ea00b 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java @@ -44,6 +44,16 @@ public class PartymemberRegisterRelationDTO implements Serializable { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java index 07aa0380ff..360131ca94 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java @@ -40,6 +40,16 @@ public class PartymemberRegisterRelationEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java index 0cc3ea4019..165651b81b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java @@ -44,6 +44,16 @@ public class RegisterRelationDTO implements Serializable { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 用户Id (user.id) */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java index ba4ff82087..2548d9b2ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java @@ -40,6 +40,16 @@ public class RegisterRelationEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 用户Id (user.id) */ From 083c9756d00b655c16b0ed3914374d079a451db9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 17:24:53 +0800 Subject: [PATCH 19/51] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcWorkLogDao.java | 16 ++++++++++++++++ .../service/impl/IcWorkLogServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java index c1a8bfb5f4..dea24ced9c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java @@ -17,7 +17,23 @@ import java.util.Map; @Mapper public interface IcWorkLogDao extends BaseDao { + /** + * 分页列表 + * + * @param params + * @return java.util.List + * @author zhy + * @date 2022/8/9 17:23 + */ List listPage(Map params); + /** + * 导出列表 + * + * @param params + * @return java.util.List + * @author zhy + * @date 2022/8/9 17:23 + */ List list4Export(Map params); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index e4881ebf1e..745b6c2d2b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -131,6 +131,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl fileList, String logId) { if (!fileList.isEmpty()) { fileList.forEach(item -> { From fb7e4c89a59f6d2c36959a45e1f7959922fd374b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 17:28:09 +0800 Subject: [PATCH 20/51] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 7ed4f50e21..02136e5045 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -57,6 +57,7 @@ AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) <= #{endTime} + ORDER BY wl.CREATED_TIME DESC \ No newline at end of file From 191dfd3aa128ae154ac4baa1a1b9ed5a54f0a07d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Aug 2022 17:55:47 +0800 Subject: [PATCH 21/51] wanshansql --- .../gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 02136e5045..cb0aac7282 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -106,7 +106,7 @@ AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) <= #{endTime} GROUP BY - wl.id + wl.id, wl.CREATED_TIME ORDER BY wl.CREATED_TIME DESC \ No newline at end of file From f7772549f5fd45f2019b0594fe9541192d9d084a Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 10 Aug 2022 09:46:18 +0800 Subject: [PATCH 22/51] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/DataSourceConstant.java | 1 + .../datastats/form/NowStatsDataFormDTO.java | 59 +++++++++ .../result/NowStatsDataResultDTO.java | 46 +++++++ .../dto/epmetuser/RegisterRelationDTO.java | 10 ++ .../data-aggregator-server/pom.xml | 28 +++++ .../controller/DataStatsController.java | 62 ++++++++++ .../dao/epmetuser/RegisterRelationDao.java | 7 +- .../dataaggre/dao/govproject/IcEventDao.java | 3 + .../dataaggre/dao/govproject/ProjectDao.java | 4 + .../resipartymember/ResiPartymemberDao.java | 31 +++++ .../epmetuser/RegisterRelationEntity.java | 10 ++ .../dataaggre/excel/NowStatsDataExcel.java | 68 ++++++++++ .../dataaggre/service/PartymemberService.java | 12 ++ .../service/datastats/DataStatsService.java | 2 + .../datastats/impl/DataStatsServiceImpl.java | 117 ++++++++++++++++++ .../service/epmetuser/EpmetUserService.java | 4 + .../epmetuser/impl/EpmetUserServiceImpl.java | 11 ++ .../service/govproject/GovProjectService.java | 5 + .../impl/GovProjectServiceImpl.java | 12 ++ .../service/impl/PartymemberServiceImpl.java | 24 ++++ .../ResiPartymemberService.java | 12 ++ .../impl/ResiPartymemberServiceImpl.java | 29 +++++ .../src/main/resources/bootstrap.yml | 5 + .../mapper/epmetuser/RegisterRelationDao.xml | 40 ++++++ .../mapper/govproject/IcEventDao.xml | 44 +++++++ .../mapper/govproject/ProjectDao.xml | 43 +++++++ .../resipartymember/ResiPartymemberDao.xml | 46 +++++++ 27 files changed, 734 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java index f02e5faa46..ae05f1af6e 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java @@ -38,4 +38,5 @@ public interface DataSourceConstant { String EPMET_T_DUCK = "epmettduck"; String EPMETTDUCK="epmettduck"; String EPMET_HEART="heart"; + String RESI_PARTYMEMBER="partymember"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java new file mode 100644 index 0000000000..06f1b6eab7 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java @@ -0,0 +1,59 @@ +package com.epmet.dataaggre.dto.datastats.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 数据统计页面查询-接口入参 + */ +@Data +public class NowStatsDataFormDTO implements Serializable { + + private static final long serialVersionUID = 6462094914874831738L; + + public interface CustomerDataManageForm{} + + /** + * 客户ID + */ + @NotBlank(message = "客户ID不能为空",groups = CustomerDataManageForm.class) + private String customerId; + + /** + * 组织ID + */ + @NotBlank(message = "组织ID不能为空",groups = CustomerDataManageForm.class) + private String agencyId; + + /** + * 区间:Interval 截止:end + */ + @NotBlank(message = "type不能为空",groups = CustomerDataManageForm.class) + private String type; + + /** + * 开始时间 精确到秒【yyyy-MM-dd HH:mm:ss】 + */ + private String startTime; + + /** + * 结束时间 精确到秒【yyyy-MM-dd HH:mm:ss】 + */ + @NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class) + private String endTime; + + + //组织或网格Id集合 + private List idList; + //数据类型【组织agency 网格grid】 + private String dataType; + + /** + * desc:是否是导出 + */ + private boolean export = false; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java new file mode 100644 index 0000000000..537179b3e1 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description 数据统计页面查询-接口返参 + */ +@Data +public class NowStatsDataResultDTO { + + //组织、网格Id + private String orgId; + //组织、网格名称 + private String orgName; + //注册居民数 + private Integer resiUserCount = 0; + //注册党员数 + private Integer partyMemberCount = 0; + //事件总数 + private Integer icEventCount = 0; + //居民上报事件数【小程序端随手拍随时讲】 + private Integer resiEventCount = 0; + //平台录入事件数【数字平台录入的事件数】 + private Integer pcEventCount = 0; + //项目总数 + private Integer projectCount = 0; + //议题转项目数 + private Integer issueProjectCount = 0; + //事件立项数 + private Integer icEventProjectCount = 0; + //直接立项项目数 + private Integer agencyProjectCount = 0; + + + //组织的pids + private String pids; + //事件来源，0代表居民点 其他代表数字平台 + private String sourceType; + //项目来源 issue议题 agency立项 ic_event事件 + private String origin; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java index 2759e4f745..a3e354859a 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java @@ -44,6 +44,16 @@ public class RegisterRelationDTO implements Serializable { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 1c61ede4bc..27873367ec 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -259,6 +259,13 @@ epmet_heart_user EpmEt-db-UsEr + + + + + epmet_resi_partymember_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -390,6 +397,13 @@ epmet_heart_user EpmEt-db-UsEr + + + + + epmet_resi_partymember_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -522,6 +536,13 @@ epmet elink@833066 + + + + + epmet + elink@833066 + 0 192.168.10.150 @@ -654,6 +675,13 @@ epmet_heart_user EpmEt-db-UsEr + + + + + epmet_resi_partymember_user + EpmEt-db-UsEr + 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java index a4d88b3a91..4ebceec4a4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java @@ -1,11 +1,25 @@ package com.epmet.dataaggre.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.datastats.form.*; import com.epmet.dataaggre.dto.datastats.result.*; +import com.epmet.dataaggre.excel.NowStatsDataExcel; import com.epmet.dataaggre.service.datastats.DataStatsService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -13,13 +27,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; import java.text.ParseException; +import java.util.Date; import java.util.List; /** * @Author sun * @Description 数据统计服务 */ +@Slf4j @RestController @RequestMapping("datastats") public class DataStatsController { @@ -243,4 +261,48 @@ public class DataStatsController { return new Result().ok(dataStatsService.operateExport(formDTO)); } + /** + * @Description 数据统计页面查询【用户、项目、事件一些数据的实时统计查询】 + * 需求：数据统计页面查询：注册居民数、注册党员数、事件总数、居民上报事件数、平台录入事件数、项目总数、议题转项目数、事件立项数、立项数； + * 可根据组织（只选组织，查询直属下级数据）、选择统计类型（截止累计值/区间新增值，截止累计选择一天，区间选择时间段，精确到时分秒）筛选； + * 可点击查看总计，可导出，打开页面默认选中当前工作人员所在组织（页面参考灵山卫-人房信息统计页面） + * @author sun + */ + @PostMapping("nowstatsdata") + public Result> nowStatsData(@RequestBody NowStatsDataFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, NowStatsDataFormDTO.CustomerDataManageForm.class); + formDTO.setExport(false); + return new Result>().ok(dataStatsService.nowStatsData(formDTO)); + } + + @PostMapping("nowstatsdataexport") + public void nowStatsDataExport(@RequestBody NowStatsDataFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setExport(true); + ExcelWriter excelWriter = null; + try { + String fileName = "数据统计" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NowStatsDataExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List data = null; + List list = null; + data = dataStatsService.nowStatsData(formDTO); + list = ConvertUtils.sourceToTarget(data, NowStatsDataExcel.class); + excelWriter.write(list, writeSheet); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java index ced9de54cd..bb2f1d225b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java @@ -18,9 +18,13 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.entity.epmetuser.RegisterRelationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 注册关系表 用于统计客户网格的注册居民数 * @@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface RegisterRelationDao extends BaseDao { - + + List selectNowResiUser(NowStatsDataFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java index 7cbb6dd87f..c8e69a05a9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; import com.epmet.dataaggre.entity.govproject.IcEventEntity; @@ -25,4 +27,5 @@ public interface IcEventDao extends BaseDao { */ List getEventInfos(CoverageHomeSearchFormDTO formDTO); + List getIcEvent(NowStatsDataFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 956e8b95ed..2c7792f6ee 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -18,6 +18,8 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; @@ -132,4 +134,6 @@ public interface ProjectDao extends BaseDao { List getMemberClosedProjectCount(OrgStatisticsFormDTO formDTO); List getAgencyProjectCount(OrgStatisticsFormDTO formDTO); List getAgencyClosedProjectCount(OrgStatisticsFormDTO formDTO); + + List getNowProject(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java new file mode 100644 index 0000000000..06429e42db --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java @@ -0,0 +1,31 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dao.resipartymember; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ResiPartymemberDao { + + List getNowPart(NowStatsDataFormDTO formDTO); + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java index 4c21db9b8d..60ee1dc873 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java @@ -40,6 +40,16 @@ public class RegisterRelationEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java new file mode 100644 index 0000000000..0df02e5ab5 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java @@ -0,0 +1,68 @@ +/** + * 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.dataaggre.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +@Data +public class NowStatsDataExcel { + + //组织、网格名称 + @ExcelProperty(value = "组织名称") + @ColumnWidth(25) + private String orgName; + //注册居民数 + @ExcelProperty(value = "注册居民数") + @ColumnWidth(20) + private Integer resiUserCount; + //注册党员数 + @ExcelProperty(value = "注册党员数") + @ColumnWidth(20) + private Integer partyMemberCount; + //事件总数 + @ExcelProperty(value = "事件总数") + @ColumnWidth(20) + private Integer icEventCount; + //居民上报事件数【小程序端随手拍随时讲】 + @ExcelProperty(value = "居民上报事件数") + @ColumnWidth(20) + private Integer resiEventCount; + //平台录入事件数【数字平台录入的事件数】 + @ExcelProperty(value = "平台录入事件数") + @ColumnWidth(20) + private Integer pcEventCount; + //项目总数 + @ExcelProperty(value = "项目总数") + @ColumnWidth(20) + private Integer projectCount; + //议题转项目数 + @ExcelProperty(value = "议题转项目数") + @ColumnWidth(20) + private Integer issueProjectCount; + //事件立项数 + @ExcelProperty(value = "事件立项数") + @ColumnWidth(20) + private Integer icEventProjectCount; + //直接立项项目数 + @ExcelProperty(value = "立项数") + @ColumnWidth(20) + private Integer agencyProjectCount; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java new file mode 100644 index 0000000000..c610a16a1c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java @@ -0,0 +1,12 @@ +package com.epmet.dataaggre.service; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; + +import java.util.List; + +public interface PartymemberService { + + List getNowPart(NowStatsDataFormDTO formDTO); + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 7ce06a88e5..650f40b83f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -306,4 +306,6 @@ public interface DataStatsService { Map getMemberMap(String agencyId); PageData getMemberList(OrgStatisticsFormDTO formDTO); + + List nowStatsData(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index bf56d8cdb8..5acc263059 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -40,10 +40,13 @@ import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; import com.epmet.dataaggre.excel.CustomerDataManageExcel; + import com.epmet.dataaggre.service.PartymemberService; import com.epmet.dataaggre.service.datastats.DataStatsService; + import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govorg.GovOrgService; + import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -86,6 +89,12 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService; @Autowired private GovOrgService govOrgService; + @Autowired + private EpmetUserService epmetUserService; + @Autowired + private GovProjectService govProjectService; + @Autowired + private PartymemberService partymemberService; /** * @Param formDTO @@ -2310,4 +2319,112 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + @Override + public List nowStatsData(NowStatsDataFormDTO formDTO) { + //1.必要参数校验及处理 + String startTimeForm = formDTO.getStartTime(); + if ("Interval".equals(formDTO.getType()) && StringUtils.isEmpty(startTimeForm)) { + throw new RenException("请选择开始时间或查询累计值"); + } + + //2.查询组织信息，判断要查询下级是组织还是网格数据 + ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + if (null == agencyGrid) { + return new ArrayList<>(); + } + //组织或网格Id集合 + List idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList()); + formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode()); + formDTO.setIdList(idList); + + //3.按条件分别查询统计各业务实时数据 + //3-1.注册居民、注册党员数 + List user = epmetUserService.getNowResiUser(formDTO); + List party = partymemberService.getNowPart(formDTO); + //3-2.事件总数、居民上报事件数、平台录入事件数 + List event = govProjectService.getNowIcEvent(formDTO); + //3-3.项目总数、议题转项目数、事件立项数、组织立项数 + List project = govProjectService.getNowProject(formDTO); + Map userMap = new HashMap<>(); + Map partyMap = new HashMap<>(); + Map eventMap = new HashMap<>(); + Map projectMap = new HashMap<>(); + if ("grid".equals(formDTO.getDataType())) { + userMap = CollectionUtils.isEmpty(user) ? new HashMap<>() : user.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + partyMap = CollectionUtils.isEmpty(party) ? new HashMap<>() : party.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + eventMap = CollectionUtils.isEmpty(event) ? new HashMap<>() : event.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + projectMap = CollectionUtils.isEmpty(project) ? new HashMap<>() : project.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + } + + //4.封装数据 + List resultDTOList = new ArrayList<>(); + NowStatsDataResultDTO export = new NowStatsDataResultDTO(); + export.setOrgName("合计"); + for (ScreenAgencyOrGridListDTO.AgencyGrid org : agencyGrid.getAgencyGridList()) { + NowStatsDataResultDTO dto = new NowStatsDataResultDTO(); + dto.setOrgId(org.getOrgId()); + dto.setOrgName(org.getOrgName()); + //网格数据sql已统计好 + if ("grid".equals(formDTO.getDataType())) { + if (userMap.containsKey(org.getOrgId())) { + dto.setResiUserCount(userMap.get(org.getOrgId()).getResiUserCount()); + } + if (partyMap.containsKey(org.getOrgId())) { + dto.setPartyMemberCount(partyMap.get(org.getOrgId()).getPartyMemberCount()); + } + if (eventMap.containsKey(org.getOrgId())) { + dto.setIcEventCount(eventMap.get(org.getOrgId()).getIcEventCount()); + dto.setResiEventCount(eventMap.get(org.getOrgId()).getResiEventCount()); + dto.setPcEventCount(eventMap.get(org.getOrgId()).getPcEventCount()); + } + if (projectMap.containsKey(org.getOrgId())) { + dto.setProjectCount(projectMap.get(org.getOrgId()).getProjectCount()); + dto.setIssueProjectCount(projectMap.get(org.getOrgId()).getIssueProjectCount()); + dto.setIcEventProjectCount(projectMap.get(org.getOrgId()).getIcEventProjectCount()); + dto.setAgencyProjectCount(projectMap.get(org.getOrgId()).getAgencyProjectCount()); + } + } else { + //组织数据 需要java计算结果 + int resiUserCount = (int) user.stream().filter(u -> u.getPids().contains(org.getOrgId())).count(); + dto.setResiUserCount(resiUserCount); + + int partyMemberCount = (int) party.stream().filter(p -> p.getPids().contains(org.getOrgId())).count(); + dto.setPartyMemberCount(partyMemberCount); + + int resiEventCount = (int) event.stream().filter(e -> e.getPids().contains(org.getOrgId()) && "0".equals(e.getSourceType())).count(); + int pcEventCount = (int) event.stream().filter(e -> e.getPids().contains(org.getOrgId()) && !"0".equals(e.getSourceType())).count(); + int icEventCount = resiEventCount + pcEventCount; + dto.setIcEventCount(icEventCount); + dto.setResiEventCount(resiEventCount); + dto.setPcEventCount(pcEventCount); + + int issueProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "issue".equals(p.getOrigin())).count(); + int icEventProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "ic_event".equals(p.getOrigin())).count(); + int agencyProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "agency".equals(p.getOrigin())).count(); + int projectCount = issueProjectCount + icEventProjectCount + agencyProjectCount; + dto.setProjectCount(projectCount); + dto.setIssueProjectCount(issueProjectCount); + dto.setIcEventProjectCount(icEventProjectCount); + dto.setAgencyProjectCount(agencyProjectCount); + } + resultDTOList.add(dto); + if (formDTO.isExport()) { + export.setResiUserCount(export.getResiUserCount() + dto.getResiUserCount()); + export.setPartyMemberCount(export.getPartyMemberCount() + dto.getPartyMemberCount()); + export.setIcEventCount(export.getIcEventCount() + dto.getIcEventCount()); + export.setResiEventCount(export.getResiEventCount() + dto.getResiEventCount()); + export.setPcEventCount(export.getPcEventCount() + dto.getPcEventCount()); + export.setProjectCount(export.getProjectCount() + dto.getProjectCount()); + export.setIssueProjectCount(export.getIssueProjectCount() + dto.getIssueProjectCount()); + export.setIcEventProjectCount(export.getIcEventProjectCount() + dto.getIcEventProjectCount()); + export.setAgencyProjectCount(export.getAgencyProjectCount() + dto.getAgencyProjectCount()); + } + } + if (formDTO.isExport()) { + resultDTOList.add(export); + } + return resultDTOList; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 6f9ce93725..068b1176cd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.service.epmetuser; import com.epmet.commons.tools.page.PageData; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; @@ -236,4 +238,6 @@ public interface EpmetUserService { Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); + + List getNowResiUser(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 14d9bd5dc5..26c5ef1b3a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -15,6 +15,8 @@ import com.epmet.constant.BadgeConstant; import com.epmet.constant.OrgInfoConstant; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmetuser.*; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO; import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO; @@ -90,6 +92,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { private IcResiUserDao icResiUserDao; @Resource private CustomerFootBarService customerFootBarService; + @Resource + private RegisterRelationDao registerRelationDao; /** * @Description 根据UserIds查询 @@ -912,4 +916,11 @@ public class EpmetUserServiceImpl implements EpmetUserService { return icResiUserDao.listVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); } } + + @Override + public List getNowResiUser(NowStatsDataFormDTO formDTO) { + //实时统计组织/网格下小程序端注册居民数 + List list = registerRelationDao.selectNowResiUser(formDTO); + return list; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 12f901ed66..6b36beac2b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; @@ -180,4 +182,7 @@ public interface GovProjectService { */ List getEventInfos(CoverageHomeSearchFormDTO formDTO); + List getNowIcEvent(NowStatsDataFormDTO formDTO); + + List getNowProject(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index caa0bf8e87..4eefc02d34 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -21,8 +21,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govproject.IcEventDao; import com.epmet.dataaggre.dao.govproject.ProjectDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -797,4 +799,14 @@ public class GovProjectServiceImpl implements GovProjectService { return icEventDao.getEventInfos(formDTO); } + @Override + public List getNowIcEvent(NowStatsDataFormDTO formDTO) { + return icEventDao.getIcEvent(formDTO); + } + + @Override + public List getNowProject(NowStatsDataFormDTO formDTO) { + return projectDao.getNowProject(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java new file mode 100644 index 0000000000..cdfab84c0f --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.service.impl; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; +import com.epmet.dataaggre.service.PartymemberService; +import com.epmet.dataaggre.service.resipartymember.ResiPartymemberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +public class PartymemberServiceImpl implements PartymemberService { + + @Autowired + private ResiPartymemberService resiPartymemberService; + + @Override + public List getNowPart(NowStatsDataFormDTO formDTO) { + return resiPartymemberService.getNowPart(formDTO); + } +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java new file mode 100644 index 0000000000..1d5bb43a23 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java @@ -0,0 +1,12 @@ +package com.epmet.dataaggre.service.resipartymember; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; + +import java.util.List; + +public interface ResiPartymemberService { + + List getNowPart(NowStatsDataFormDTO formDTO); + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java new file mode 100644 index 0000000000..cb45cb5f17 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java @@ -0,0 +1,29 @@ +package com.epmet.dataaggre.service.resipartymember.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.resipartymember.ResiPartymemberDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; +import com.epmet.dataaggre.service.resipartymember.ResiPartymemberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@DataSource(DataSourceConstant.RESI_PARTYMEMBER) +public class ResiPartymemberServiceImpl implements ResiPartymemberService { + + @Autowired + private ResiPartymemberDao resiPartymemberDao; + + + @Override + public List getNowPart(NowStatsDataFormDTO formDTO) { + return resiPartymemberDao.getNowPart(formDTO); + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index aa857a1eaf..0237f7f5d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -161,6 +161,11 @@ dynamic: url: @datasource.druid.heart.url@ username: @datasource.druid.heart.username@ password: @datasource.druid.heart.password@ + partymember: + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.partymember.url@ + username: @datasource.druid.partymember.username@ + password: @datasource.druid.partymember.password@ feign: hystrix: enabled: true diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml index 21a959c15e..2ecbd63552 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml @@ -3,4 +3,44 @@ + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index c037d97239..fdba65d9cd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -27,4 +27,48 @@ AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 1b159cb69d..4b51beae89 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -539,4 +539,47 @@ AGENCY_ID + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml new file mode 100644 index 0000000000..058581128d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml @@ -0,0 +1,46 @@ + + + + + + + + From 98a0e4bc8519995d507f8e581609f348a7d837b7 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 10 Aug 2022 10:21:41 +0800 Subject: [PATCH 23/51] =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E8=AE=A1=E6=97=A7=E7=A8=8B=E5=BA=8F=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 10 ++++++++++ .../service/impl/RegisterRelationServiceImpl.java | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index ae67b95ebf..74b9ba9844 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -5,7 +5,10 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.*; @@ -601,6 +604,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberRegisterRelationEntity registerRelationEntity = new PartymemberRegisterRelationEntity(); registerRelationEntity.setCustomerId(partyMemberInfoDTO.getCustomerId()); registerRelationEntity.setGridId(partyMemberInfoDTO.getGridId()); + //表中新增字段 为其赋值 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(partyMemberInfoDTO.getGridId()); + if (null == gridInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存失败", "获取网格缓存失败"); + } + registerRelationEntity.setAgencyId(gridInfo.getPid()); + registerRelationEntity.setAgencyIdPath(gridInfo.getPids()); registerRelationEntity.setUserId(partyMemberInfoDTO.getUserId()); registerRelationEntity.setFirstRegister(1); registerRelationEntity.setRegister(1); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index d63921e97a..bf7f42d6f9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -23,7 +23,11 @@ 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.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserConstant; @@ -344,6 +348,13 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl Date: Wed, 10 Aug 2022 10:32:06 +0800 Subject: [PATCH 24/51] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC(?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=80=E5=9B=9E=E5=90=B9=E5=93=A8=E7=BB=93?= =?UTF-8?q?=E6=A1=88)=E6=97=B6=E5=85=AC=E5=BC=80=E7=AD=94=E5=A4=8D?= =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/ProjectResponseFormDTO.java | 2 ++ .../src/main/java/com/epmet/dto/form/ReturnFromDTO.java | 2 ++ .../src/main/java/com/epmet/dto/form/TransferFormDTO.java | 1 + 3 files changed, 5 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java index 068d449a4a..05402a071d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -29,6 +30,7 @@ public class ProjectResponseFormDTO implements Serializable { /** * 公开答复内容 */ + @NotBlank(message = "公开答复不能为空") @Length(max = 1000, message = "公开答复不能超过1000个字符") private String publicReply; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java index 9953e31be7..7d34814d54 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -30,6 +31,7 @@ public class ReturnFromDTO implements Serializable { /** * 公开答复内容 */ + @NotBlank(message = "公开答复不能为空") @Length(max = 1000, message = "公开答复不能超过1000个字符") private String publicReply; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java index f6033bdd6a..ec3c6bd18a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java @@ -22,6 +22,7 @@ public class TransferFormDTO implements Serializable { @NotBlank(message = "项目人员关联Id不能为空") private String projectStaffId; + @NotBlank(message = "公开答复不能为空") @Length(max=1000,message = "公开答复内容不能超过1000位") private String publicReply; From b55f97f7cc7c95d9ffee443f6a1dbbe3456c5cae Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 11 Aug 2022 09:57:30 +0800 Subject: [PATCH 25/51] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E3=80=81=E7=BD=91=E6=A0=BC=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/CustomerAgencyDao.java | 2 + .../dataaggre/dao/govorg/CustomerGridDao.java | 2 + .../datastats/impl/DataStatsServiceImpl.java | 2 +- .../service/govorg/GovOrgService.java | 3 ++ .../govorg/impl/GovOrgServiceImpl.java | 43 +++++++++++++++++++ .../mapper/govorg/CustomerAgencyDao.xml | 17 ++++++++ .../mapper/govorg/CustomerGridDao.xml | 15 +++++++ 7 files changed, 83 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index ba9043c0f4..7c3bbfd838 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import org.apache.ibatis.annotations.Mapper; @@ -108,4 +109,5 @@ public interface CustomerAgencyDao extends BaseDao { List getSubAgencyList(@Param("agencyId") String agencyId); + List getSubAgencyListByAgency(@Param("customerId") String customerId, @Param("agencyId") String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java index 2d2c95b424..10721a9f7a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; @@ -84,4 +85,5 @@ public interface CustomerGridDao extends BaseDao { */ CustomerGridDTO getGridInfo(@Param("gridId") String gridId); + List getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 5acc263059..fd2a4e5f85 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2329,7 +2329,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //2.查询组织信息，判断要查询下级是组织还是网格数据 - ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId()); if (null == agencyGrid) { return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index ae942731a0..6a55f59e53 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; @@ -289,4 +290,6 @@ public interface GovOrgService { List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); + ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index b84b11d14f..96099374f8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.DingTextBriefNessFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgLevelEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -39,6 +40,9 @@ import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.govorg.*; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; @@ -1467,4 +1471,43 @@ public class GovOrgServiceImpl implements GovOrgService { public Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getEnterpriseInfosCount(formDTO); } + + @Override + public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) { + ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO(); + List agencyGridList = new ArrayList<>(); + //1.查询组织信息 + CustomerAgencyEntity dto = customerAgencyDao.selectById(agencyId); + if (dto == null) { + log.error(String.format("组织信息不存在,组织Id->%s", agencyId)); + return new ScreenAgencyOrGridListDTO(); + } + //2.根据组织级别判断查询直属组织或网格列表 + List agencyList = new ArrayList<>(); + List gridList = new ArrayList<>(); + if (!"community".equals(dto.getLevel())) { + //2-1.直属下级组织列表 + agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId); + agencyList.forEach(gr->{ + ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); + org.setOrgId(gr.getAgencyId()); + org.setOrgName(gr.getAgencyName()); + agencyGridList.add(org); + }); + } else { + //2-2.直属下级网格列表 + gridList = customerGridDao.getSubGridList(customerId, agencyId); + gridList.forEach(gr->{ + ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); + org.setOrgId(gr.getGridId()); + org.setOrgName(gr.getGridName()); + agencyGridList.add(org); + }); + } + + resultDTO.setLevel(dto.getLevel()); + resultDTO.setAgencyGridList(agencyGridList); + return resultDTO; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index a77f1f22e0..9af0849b72 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -309,4 +309,21 @@ OR PIDS LIKE CONCAT('%', #{agencyId}, '%')) + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 7f68c5d787..2457f87733 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -181,4 +181,19 @@ AND cg.DEL_FLAG = '0' + + From e464525b5f0dc0f66f5d4bebb9a2c09c1bd1d203 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 11 Aug 2022 11:09:23 +0800 Subject: [PATCH 26/51] kehudi --- .../main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 745b6c2d2b..49d3a2b73a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -121,6 +121,7 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl Date: Thu, 11 Aug 2022 13:46:51 +0800 Subject: [PATCH 27/51] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index cb0aac7282..27c62fd8ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -49,7 +49,9 @@ AND wl.MOBILE = #{mobile} - AND wl.CREATED_BY = #{createdBy} + + AND wl.CREATED_BY = #{createdBy} + AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime} From a196cc4ac235bee1a705e4dc85591e1318da72e7 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 11 Aug 2022 13:48:22 +0800 Subject: [PATCH 28/51] bug --- .../gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 27c62fd8ed..0e0c4dae24 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -48,7 +48,7 @@ AND wl.MOBILE = #{mobile} - + AND wl.CREATED_BY = #{createdBy} From 9dd39760903ae3374c7652bdef08dbb693a77127 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 Aug 2022 13:53:53 +0800 Subject: [PATCH 29/51] =?UTF-8?q?ic=5Fresi=5Fuser=E6=96=B0=E5=A2=9Eis=5Fxj?= =?UTF-8?q?c;=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/epmetuser/IcResiUserEntity.java | 15 ++++ .../epmet/entity/user/IcResiUserEntity.java | 5 ++ .../dto/result/IcFormDataAnalysisDTO.java | 27 +++++++ .../java/com/epmet/dao/IcFormItemDao.java | 2 + .../ResiCategoryStatsConfigServiceImpl.java | 79 ++++++++----------- .../main/resources/mapper/IcFormItemDao.xml | 19 +++++ .../java/com/epmet/dto/IcResiUserDTO.java | 15 ++++ .../com/epmet/entity/IcResiUserEntity.java | 4 + .../db/migration/V0.0.64__resi_xjc.sql | 1 + 9 files changed, 120 insertions(+), 47 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java index 657b37bb14..517b65938a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java @@ -215,6 +215,21 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String isSpecial; + /** + * 是否租户【是:1 否:0】 + */ + private String isTenant; + + /** + * 是否流动人口【是:1 否:0】 + */ + private String isFloating; + + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** * 文化程度【字典表】 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java index 4a2260b045..7436847fd2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/IcResiUserEntity.java @@ -225,6 +225,11 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String isFloating; + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** * 文化程度【字典表】 */ diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java new file mode 100644 index 0000000000..50553ab568 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcFormDataAnalysisDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/11 13:35 + */ +@Data +public class IcFormDataAnalysisDTO implements Serializable { + private String itemId; + private String label; + /** + * 分组ID,'默认，0' + */ + private String itemGroupId; + private String tableName; + /** + * 列名 + */ + private String columnName; + private Integer sort; +} + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index df9da799b0..fbc68cac11 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -97,4 +97,6 @@ public interface IcFormItemDao extends BaseDao { */ List getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId); List getItemListByGroupIdV2(@Param("customerId") String customerId, @Param("groupId") String groupId,@Param("policyFlag")String policyFlag); + + List selectDataAnalysisItem(String customerId); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java index a21534cdce..6bd45b6152 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java @@ -1,20 +1,15 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.StrConstant; -import com.epmet.constant.IcResiCategoryStatsConfigConstant; import com.epmet.dao.IcFormItemDao; -import com.epmet.dao.IcFormItemGroupDao; import com.epmet.dao.IcResiCategoryStatsConfigDao; import com.epmet.dao.IcResiCategoryWarnConfigDao; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO; import com.epmet.dto.form.IcResiCategoryStatsConfigSortFormDTO; import com.epmet.dto.form.ResiCategoryStatsConfigListFormDTO; +import com.epmet.dto.result.IcFormDataAnalysisDTO; import com.epmet.dto.result.IcResiCategoryStatsConfigResultDTO; -import com.epmet.entity.IcFormItemEntity; -import com.epmet.entity.IcFormItemGroupEntity; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import com.epmet.entity.IcResiCategoryWarnConfigEntity; import com.epmet.service.IcResiCategoryStatsConfigService; @@ -28,7 +23,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j @@ -40,8 +38,6 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf @Resource private IcFormItemDao icFormItemDao; @Resource - private IcFormItemGroupDao icFormItemGroupDao; - @Resource private IcResiCategoryStatsConfigDao icResiCategoryStatsConfigDao; @Resource private IcResiCategoryWarnConfigDao icResiCategoryWarnConfigDao; @@ -52,60 +48,39 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf @Transactional(rollbackFor = Exception.class) public List list(String customerId, ResiCategoryStatsConfigListFormDTO formDTO) { //1.获取IC_FORM_ITEM 中 用于数据分析字段的 id 和label - List icFormItemEntityList = icFormItemDao.selectList(new QueryWrapper().lambda().eq(IcFormItemEntity::getCustomerId,customerId).eq(IcFormItemEntity::getDataAnalyse, 1)); - if(CollectionUtils.isEmpty(icFormItemEntityList)){ - return new ArrayList<>(); - } - Set groupIds = icFormItemEntityList.stream().filter(item-> !"0".equals(item.getItemGroupId())).map(IcFormItemEntity::getItemGroupId).collect(Collectors.toSet()); - List icFormItemGroupEntityList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(groupIds)){ - icFormItemGroupEntityList.addAll(icFormItemGroupDao.selectList(new QueryWrapper().lambda().eq(IcFormItemGroupEntity::getCustomerId,customerId).in(IcFormItemGroupEntity::getId, groupIds))); - } - - //获取tableName和COLUMN_NAME - Map tableColumnMap = new HashMap<>(); + List dataItemList=icFormItemDao.selectDataAnalysisItem(customerId); + //key:tableName-columnName value: ic_form_item + Map tableColumnMap = new HashMap<>(); + //key:ic_form_item.id value:对应的表名 Map idTableMap = new HashMap<>(); - icFormItemEntityList.forEach(item->{ - Map map = new HashMap<>(); - item.setColumnName(item.getColumnName().concat(NumConstant.ZERO == item.getColumnNum() ? StrConstant.EPMETY_STR : item.getColumnNum().toString())); - if("0".equals(item.getItemGroupId())){ - tableColumnMap.put(IcResiCategoryStatsConfigConstant.IC_RESI_USER+"-"+item.getColumnName(),item); - idTableMap.put(item.getId(),IcResiCategoryStatsConfigConstant.IC_RESI_USER); - }else{ - List collect = icFormItemGroupEntityList.stream().filter(i -> item.getItemGroupId().equals(i.getId())).collect(Collectors.toList()); - tableColumnMap.put(CollectionUtils.isEmpty(collect)?IcResiCategoryStatsConfigConstant.IC_RESI_USER:collect.get(0).getTableName()+"-"+item.getColumnName(),item); - idTableMap.put(item.getId(),CollectionUtils.isEmpty(collect)?IcResiCategoryStatsConfigConstant.IC_RESI_USER:collect.get(0).getTableName()); - } + dataItemList.forEach(item->{ + tableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); + idTableMap.put(item.getItemId(),item.getTableName()); }); - //2.获取ic_resi_category_stats_config 和 ic_resi_category_warn_config 表中的数据 + //2.获取居民类别配置表ic_resi_category_stats_config 和 居民类别预警配置表ic_resi_category_warn_config 表中的数据 List statsConfigEntityList = icResiCategoryStatsConfigDao.selectList(new QueryWrapper().lambda().eq(IcResiCategoryStatsConfigEntity::getCustomerId,customerId)); - if (!CollectionUtils.isEmpty(statsConfigEntityList)){ - return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); - } + List warnConfigEntityList = icResiCategoryWarnConfigDao.selectList(new QueryWrapper().lambda().eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId)); - //3.新增不存在的，删除不在tableColumnMap的 + //获取居民类别配置表 Map statsTableColumnMap = new HashMap<>(); statsConfigEntityList.forEach(item->{ statsTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); }); - Map warnTableColumnMap = new HashMap<>(); - warnConfigEntityList.forEach(item->{ - warnTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); - }); + + //3.新增不存在的，删除不在tableColumnMap的 //差集 - //新增 List newStatsList = tableColumnMap.keySet().stream().filter(item -> !statsTableColumnMap.containsKey(item)).collect(Collectors.toList()); List newStatsEntityList = new ArrayList<>(); newStatsList.forEach(item->{ - IcFormItemEntity icFormItemEntity = tableColumnMap.get(item); + IcFormDataAnalysisDTO icFormItemEntity = tableColumnMap.get(item); IcResiCategoryStatsConfigEntity entity = new IcResiCategoryStatsConfigEntity(); entity.setCustomerId(customerId); entity.setLabel(icFormItemEntity.getLabel()); - entity.setTableName(idTableMap.get(icFormItemEntity.getId())); + entity.setTableName(idTableMap.get(icFormItemEntity.getItemId())); entity.setColumnName(icFormItemEntity.getColumnName()); entity.setManagementIcon(""); entity.setDataIcon(""); @@ -115,16 +90,24 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf newStatsEntityList.add(entity); }); if(!CollectionUtils.isEmpty(newStatsEntityList)){ + //新增居民类别配置表 icResiCategoryStatsConfigService.insertBatch(newStatsEntityList); } + + //4、新增居民类别预警配置表 + Map warnTableColumnMap = new HashMap<>(); + warnConfigEntityList.forEach(item->{ + warnTableColumnMap.put(item.getTableName()+"-"+item.getColumnName(),item); + }); + List newWarnList = tableColumnMap.keySet().stream().filter(item -> !warnTableColumnMap.containsKey(item)).collect(Collectors.toList()); List newWarnEntityList = new ArrayList<>(); newWarnList.forEach(item->{ - IcFormItemEntity icFormItemEntity = tableColumnMap.get(item); + IcFormDataAnalysisDTO icFormItemEntity = tableColumnMap.get(item); IcResiCategoryWarnConfigEntity entity = new IcResiCategoryWarnConfigEntity(); entity.setCustomerId(customerId); entity.setLabel(icFormItemEntity.getLabel()); - entity.setTableName(idTableMap.get(icFormItemEntity.getId())); + entity.setTableName(idTableMap.get(icFormItemEntity.getItemId())); entity.setColumnName(icFormItemEntity.getColumnName()); entity.setWarn("0"); entity.setSort(icFormItemEntity.getSort()); @@ -133,6 +116,8 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf if(!CollectionUtils.isEmpty(newWarnEntityList)){ icResiCategoryWarnConfigService.insertBatch(newWarnEntityList); } + + //5、原来用于数据分析，现在不用于数据分析的，要删除类别配置表和预警表 List delStatsEntityIdList = new ArrayList<>(); List delWarnEntityIdList = new ArrayList<>(); //需要删除的 @@ -151,7 +136,7 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf icResiCategoryWarnConfigService.deleteBatchIds(delWarnEntityIdList); } - //4.返回数据 + //6.返回数据 return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel()); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index e2689c4c62..02070f1b63 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -322,4 +322,23 @@ ORDER BY ifi.SORT + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 2cd1167802..d4d3cbe812 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -219,6 +219,21 @@ public class IcResiUserDTO implements Serializable { */ private String isSpecial; + /** + * 是否租户【是:1 否:0】 + */ + private String isTenant; + + /** + * 是否是流动人口【是:1 否:0】 + */ + private String isFloating; + + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** * 文化程度【字典表】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 5b70e7a653..f787399b23 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -225,6 +225,10 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String isFloating; + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; /** * 文化程度【字典表】 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql new file mode 100644 index 0000000000..9ce60670d4 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.64__resi_xjc.sql @@ -0,0 +1 @@ +alter table ic_resi_user add COLUMN IS_XJC CHAR(1) DEFAULT'0' COMMENT '是否新阶层人士【是:1 否:0】'after IS_FLOATING; \ No newline at end of file From 6b3a0ef72bddebd28e205fcf354c78785bf0c44c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 11 Aug 2022 14:15:17 +0800 Subject: [PATCH 30/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9A=E6=96=B0=E9=98=B6=E5=B1=82=E4=BA=BA=E5=A3=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/enums/IcResiUserTableEnum.java | 3 ++- .../excel/ic_resi_import_template.xls | Bin 73728 -> 74240 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java index 7ae5d5d706..c921136c00 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java @@ -35,7 +35,8 @@ public enum IcResiUserTableEnum { IC_DB("virtual_db","大病人员信息录入表", null, 2, "IS_DB", false), IC_MB("virtual_mb","慢病人员信息录入表", null, 2, "IS_MB", false), IC_TENANT("virtual_tenant","租户信息录入表", null, 2, "IS_TENANT", false), - IC_FLOATING("virtual_floating","流动人口信息录入表", null, 2, "IS_FLOATING", false); + IC_FLOATING("virtual_floating","流动人口信息录入表", null, 2, "IS_FLOATING", false), + IC_XJC("virtual_xjc","新阶层人士信息录入表", null, 2, "IS_XJC", false); private String tableName; /** diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 0cd7fc22f13ba97f87c79ce9f6b8e4d39f1299e2..a316e361b468807658bae3444a7cd918aab18181 100644 GIT binary patch delta 3572 zcmb7{e^6A{701tg`-9zOciCU;F3a*$1O*k0D5ymFsfiX4NUJ0!!e~HDM44zETPBN% zRpO75dJ|TwX{DJ?9a9a?wjpDuz;tRe8PhiDm{x5&s3eX?(=nZ7OlvCr-hFQ`tZo13 z+qrx0=X}pQ=k9&?-S@U3CWQC9XnkiIniV#Szo8T` zFaJ=PVLDg5rj(M�|R7_!7N`=Nkh2m_ESm=wH(Z`R`!=t_$#L`0wle{F?>`AJ&=p zTkto6UqDPQ>{A9m?}X1~@I>|))*6^EGHyv=EQ#MrEM#t;YAs|=zS3G4O2I(Bn7{}x zP-}T+k)LQZ^9p&$74!d$s64Yglk~HretXRSN?Y4V#z+R~OQQZn>32F+zd7npj`=ST zvXsmGs3_|40o$~MKs3_IpRlL!GTX8g1gT^CT&t~($-|G@3VF88&#&41%*^lE)?wnF zuop5L-;Zx=>>*)NMj8d2FS}9InqJxt=UHe>2O$Iu7L(uxG{B zX7Sa@TXIr`z^i5iA`53;_A9@9lqXka2Hj7J90~04hBc2}t>4n}^>t4-Z0!9G1?a~u zyrD9v++5GMRHiErKgat(C-(7EFz+4Y=V3}-<2NgVWxa2R9AjRKQp}jKh*=*RW+~q+<#F=Z*pgKQ2FRKFNC?P0W@aYBpm21z|-CD!9SC@rINg}%QrO?QD=Y3&6B3cNeM^m(B&};&1?1*W? zirCl@^H1dm^@5nlch)4@#2Gp?VLNzNYpP!K!XLO;jv=ZEU$p1qT{Z5Quf`n`>SDCm zA=rl|thgIQ-G?+@4{Jo5y6QySI!#Z574fl=RH7d{M4UMWu!2#CKUd?NF8bn5iXCDK zooK>}T+xH~F3V%bB7@7?jmCy5A}jH&S8^?)-gHdryG?vodtKycZMtHvjh-+}>HN&c zKK}AGV`Qv;5es!h2k)RsADh`DGQWAsIQ9Iz)UGl z17%6d0cA^?4w@z@7nCC@4>VoU3{bA5nV>vL`Jfq~kXpU~I8%zVK>3npgC=KY4oKW) z>Uo8`|0?m=yJW!#aP;}uH1B;|MA2e6e0+6`Z)Pg0Td6G&&lS5kw zDwf(J(0oaYv3?dvDuY%MrI1+n4+Bf3xCA6NDz)HJ&>~6YAh9v1S_MdyXNnP78bE5V z5xrq7UPevmP5m^(pQCO_sy`Gbi_pzck3CvK!Hv{OWm-W6tGN?{Rm&^5kveIKBo}C@ zBsZvBk_S{FDH&9$5w(# zT8HV{M9U;8pyiTuphrN@D;Dg2dJwG&m5a-uBLnDB8EFKq0O=Gvv;+}JTPuqS%#~`i ziJqaAGCE{Nz}IBBB^q9OmF!L}JP{tTb&4yi!w$Gf8@mm?I+?}}s+W`mnjDY=v`T8u zIC6#J&>csfI7*HqZyfnRljZ%O23asAP78n17dfvMAy;= z^u&>dRjEsfKJXZJN%TySjjI=$mH91r+*Py-=E37NB zt9?b1g?AIBzDTsAHyRV#G2~S?929*%w&4enp1#Y>a`qLXUmYeYKBoCsMV>m;ZnsQ( zov7d^M6aFH{B@Cc241z=eORmF;poH1@8|4zfbTwiNU1(8)3yvEZR6WS-yb2maZaXP z5_#2U>G&;C*9S!77i8KG&ktK|4l>;lPj&^(!H-{D$sGLl#aetXy0p(A9&C(v9Vp`O zo~~7PU((J!9y#>q8%#OzmsoAy)7KWsAKS*1_r_vA{LC)KN4LB953jFQXk7ZOAAiD> zoa>UyZ(L@|nwuIQkF?!F?(W-DbmTGL=}7GU0&f~$5e+iN2d><4wVA+bt!xvv_4zD+|!^{)@%E(^Qy=fFV{xP)6#Bvnfm|3NP zL}pcZeY=+rj=OY8HtGF2|2@AiGV>JO|ObKEm>E91ba zp_4B54V}nS-tT3le(}djTmdJV`0pZEyfK7Vd6|dZKht`Y_50a2!(RA$!aMyer0lST z|LJGXvmb?brm%Y~DZD+vLPqh@v6~Hj&%=!DtswI#X?wJEy|6E#?bBG4I5;#ro&BEu E8=?~XUH||9 delta 3466 zcmb7{du$ZP9mnUlyLY~a?|d)&&gb*_0k#1{Y+eD3@e7j>12#4!Dyf4pkWgb1W3byG zg`AO+@Ja}D5-ugeN|dUKcr;0`jZ>-`s=g3Xa1^CAqB4pD!Kqu2Q?-?wLf!A|-i>{T z{?R?n{O0rf{$_r&yR)-b()PIaXERp zx0zeKY5ZYtUf?;4k3DA*S0!!LQ^n_EfS`L%*dYUj?PEZzHz zV1BG9$nAL^+6jL#b@I_^S=^E5qFp-g*6S|RnX%JFR|CqlReXO{ZrPrVB3BAM-uSKc z!wnsq9&LHD@jC}zWI<-%EEFr%Hw-nLt4~%#tl>#MToqQ{>Ecu!Qk*aI9GH2p@?|h5 zd-=CvZlB?MszYU-_r*9C8f>X-HT6u*5n!h;8XEO$RSUB46+VDbn*PLZ!F=}` zx7UP}6T^IFO{n?u4bjg^huizR@10wa{cXfhi#GiBK5F4#40Uts{nWbK{B7iU!o<(l z1YCP9VjWwl`ssI@&edOE$5WPWW&w-u6d?wlvWnRvM42w@`26uv4yL{Nr^uvaK;owLBZ82+{hpscK9vCc0TxNjEE706NDw4;Kx5Wf zNm>XLlv*|@OHvpVl9U4y>%bT#7bI?oL3yAYhWrNR19PP~4U{KoIw)UK0ce_}LeO+c zMW6ynGeCusW`c?&%>vB;MU3>tz?o8<4Voos4rubqJOC2Un9;9L-# zd7uZRHXl?XD55XC1;A1%E(Fb$^dLw)bVkBOp!t#(gC?i81hhbEWuS$Uma^UKK}qG% z7U>ib>wXzf>`O+93eXZsm7p?7RUolL7?IT=k)9MYMri~YttPbkv3QBCLu=}91N_tV zy)EvIB+0_LQ};Oa6bc@sPF5aIs9-gBVzNeh1rJgutB~XYRZ8-LswDY9)soUdVmlHi z5mE4%bh71A^nZi#c_K;ZO(I_sr6*BF z68S-s=>wofnJ_a+3xb-Ymcweq7 zWt`Zjj6L#4eUOez{i)GADy8CkxNLA0>X!!Bp#E&|5bBmI`;^hE7`2XKv#)+diu0PD zBDQhpDk<}Zb%;;ePMA!a^3)9@;z!p Date: Thu, 11 Aug 2022 14:21:00 +0800 Subject: [PATCH 31/51] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcEventListFormDTO.java | 5 +++++ .../epmet/dto/form/OrgProjectListFormDTO.java | 5 ++++- .../dto/result/OrgProjectListResultDTO.java | 2 ++ .../java/com/epmet/excel/IcEventExcel.java | 4 ++++ .../com/epmet/excel/OrgProjectListExcel.java | 7 ++++--- .../epmet/service/impl/IcEventServiceImpl.java | 12 ++++++++++++ .../src/main/resources/mapper/IcEventDao.xml | 18 ++++++++++++++++++ .../src/main/resources/mapper/ProjectDao.xml | 17 +++++++++++++++-- 8 files changed, 64 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java index 22343e9007..c5330c05d8 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java @@ -84,5 +84,10 @@ public class IcEventListFormDTO implements Serializable { * 操作类型 0:取消标记 1:标记 */ private String type; + /** + * 事件分类 一类、二类Id集合 + */ + private List firstIdList; + private List secondIdList; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java index c2607974ee..5123bb789a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -46,6 +45,10 @@ public class OrgProjectListFormDTO extends PageFormDTO implements Serializable { * 事件状态 处理中 pending，已结案 closed */ private String status; + /** + * 解决状态 已解决 resolved，无需解决 unresolved + */ + private String closedStatus; /** * 起始上报时间 精确到秒 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java index f734a13de8..37a4f57ff7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -98,6 +98,8 @@ public class OrgProjectListResultDTO implements Serializable { */ private String status; private String statusValue; + private String closedStatus; + private String closedStatusValue; /** * 是否需要自己处理 true:需要 false:不需要 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/IcEventExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/IcEventExcel.java index 5bfc88d274..45c4bdad8d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/IcEventExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/IcEventExcel.java @@ -20,6 +20,10 @@ public class IcEventExcel { @ColumnWidth(20) private String gridName; + @ExcelProperty(value = "事件分类") + @ColumnWidth(25) + private String categoryName; + @ExcelProperty(value = "事件内容") @ColumnWidth(25) private String eventContent; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java index 0af3ccc4c9..50d9020259 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java @@ -1,12 +1,9 @@ package com.epmet.excel; -import cn.afterturn.easypoi.excel.annotation.ExcelCollection; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; -import java.util.List; - /** * 事件管理表 * @@ -122,5 +119,9 @@ public class OrgProjectListExcel { @ColumnWidth(20) private String status; + @ExcelProperty(value = "解决状态") + @ColumnWidth(20) + private String closedStatus; + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 6deb8203fa..65d8eaa099 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -125,6 +125,15 @@ public class IcEventServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_EVENT_SOURCE_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); + //查询分类信息 + IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO(); + dictFormDto.setCustomerId(formDTO.getCustomerId()); + Result> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto); + if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); + } + Map categoryMap = categoryRes.getData().stream().collect(Collectors.toMap(IssueProjectCategoryDictDTO::getId, IssueProjectCategoryDictDTO::getCategoryName)); + //封装数据 for (IcEventListResultDTO dto : list) { if (gridInfoMap.containsKey(dto.getGridId())) { @@ -133,6 +142,9 @@ public class IcEventServiceImpl extends BaseServiceImpl imageList = new ArrayList<>(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index af09210b52..230a711e86 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -218,6 +218,24 @@ AND ie.`status` = #{status} + + + #{firstId} + + + + + #{secondId} + + + + + #{firstId} + + + #{secondId} + + order by ie.created_time desc, ie.latest_operated_time desc diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 527e4bd62a..3340b6d104 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -655,6 +655,8 @@ p.back_ground, ( CASE WHEN p.`STATUS` = 'pending' THEN '处理中' WHEN p.`STATUS` = 'closed' THEN '已结案' ELSE '' END ) AS status, p.`status` AS statusValue, + ( CASE WHEN p.CLOSED_STATUS = 'resolved' THEN '已解决' WHEN p.CLOSED_STATUS = 'unresolved' THEN '无需解决' ELSE '' END ) AS closedStatus, + p.CLOSED_STATUS AS closedStatusValue, pc.category_pids, pc.category_id, pp.public_reply, @@ -671,16 +673,24 @@ group by project_id ORDER BY created_time desc )pc ON p.id = pc.project_id - + #{firstId} - + #{secondId} + + + #{firstId} + + + #{secondId} + + LEFT JOIN project_process pp ON p.id = pp.project_id AND pp.operation = 'close' INNER JOIN project_process ppc ON p.id = ppc.project_id AND ppc.operation = 'created' @@ -722,6 +732,9 @@ AND p.created_time #{endTime} + + AND p.CLOSED_STATUS = #{closedStatus} + SELECT - * + a.*, + b.CATEGORY_NAME as parentCategoryName FROM - issue_project_category_dict + issue_project_category_dict a + LEFT JOIN issue_project_category_dict b ON a.PID = b.ID + AND b.del_flag = '0' + AND b.customer_id = #{customerId} WHERE - del_flag = '0' - AND customer_id = #{customerId} + a.del_flag = '0' + AND a.customer_id = #{customerId} - id = #{id} + a.id = #{id} ORDER BY diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 55c0816f1a..f11fd1044d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -144,7 +144,11 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Fri, 12 Aug 2022 10:11:45 +0800 Subject: [PATCH 37/51] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/IcWorkLogExcel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index 3b58d200b8..328f5fbc92 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -1,6 +1,7 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.util.Date; @@ -15,24 +16,30 @@ import java.util.Date; public class IcWorkLogExcel { @Excel(name = "网格员") + @ColumnWidth(25) private String createdUser; @Excel(name = "联系电话") + @ColumnWidth(25) private String mobile; @Excel(name = "所属镇街") + @ColumnWidth(25) private String allAgencyName; @Excel(name = "所属网格") + @ColumnWidth(25) private String gridName; @Excel(name = "标题") + @ColumnWidth(25) private String title; @Excel(name = "日志时间") private String logDate; @Excel(name = "日志类型") + @ColumnWidth(25) private String logType; @Excel(name = "内容") From bfedd0d720fcbeccc05440e3671e1fa64e158708 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:22:34 +0800 Subject: [PATCH 38/51] =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcWorkLogDao.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml index 0e0c4dae24..117786e879 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml @@ -66,7 +66,11 @@ SELECT wl.CREATED_USER, wl.MOBILE, - CONCAT( a.ALL_PARENT_NAME, '-', a.ORGANIZATION_NAME ) AS allAgencyName, + IF + ( + a.ALL_PARENT_NAME = '', + a.ORGANIZATION_NAME, + CONCAT( a.ALL_PARENT_NAME, '-', a.ORGANIZATION_NAME )) AS allAgencyName, g.GRID_NAME, wl.TITLE, wl.LOG_DATE, From 38660ca0224f96b4f001f0f20ed8d5401da2f18a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:26:13 +0800 Subject: [PATCH 39/51] =?UTF-8?q?=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcWorkLogExcel.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index 328f5fbc92..34b09af786 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -1,11 +1,8 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; -import java.util.Date; - /** * 网格员工作日志 * @@ -15,31 +12,25 @@ import java.util.Date; @Data public class IcWorkLogExcel { - @Excel(name = "网格员") - @ColumnWidth(25) + @Excel(name = "网格员", width = 25) private String createdUser; - @Excel(name = "联系电话") - @ColumnWidth(25) + @Excel(name = "联系电话", width = 25) private String mobile; - @Excel(name = "所属镇街") - @ColumnWidth(25) + @Excel(name = "所属镇街", width = 25) private String allAgencyName; - @Excel(name = "所属网格") - @ColumnWidth(25) + @Excel(name = "所属网格", width = 25) private String gridName; - @Excel(name = "标题") - @ColumnWidth(25) + @Excel(name = "标题", width = 25) private String title; @Excel(name = "日志时间") private String logDate; - @Excel(name = "日志类型") - @ColumnWidth(25) + @Excel(name = "日志类型", width = 25) private String logType; @Excel(name = "内容") From 684b330af67e4f96eca55aded0c860dcac4ce53e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 10:33:19 +0800 Subject: [PATCH 40/51] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/excel/IcWorkLogExcel.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java index 34b09af786..04c86926d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java @@ -12,10 +12,10 @@ import lombok.Data; @Data public class IcWorkLogExcel { - @Excel(name = "网格员", width = 25) + @Excel(name = "网格员", width = 15) private String createdUser; - @Excel(name = "联系电话", width = 25) + @Excel(name = "联系电话", width = 20) private String mobile; @Excel(name = "所属镇街", width = 25) @@ -27,19 +27,19 @@ public class IcWorkLogExcel { @Excel(name = "标题", width = 25) private String title; - @Excel(name = "日志时间") + @Excel(name = "日志时间", width = 15) private String logDate; - @Excel(name = "日志类型", width = 25) + @Excel(name = "日志类型", width = 15) private String logType; - @Excel(name = "内容") + @Excel(name = "内容", width = 100) private String content; - @Excel(name = "备注") + @Excel(name = "备注", width = 50) private String remark; - @Excel(name = "照片") + @Excel(name = "照片", width = 50) private String url; } \ No newline at end of file From 6435443963bf1dc941cc091d6d3f8fc733b5e8f4 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 12 Aug 2022 10:34:10 +0800 Subject: [PATCH 41/51] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E5=AD=97=E5=85=B8=E8=A1=A8=E6=94=B9=E5=80=BC?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/public_service_template.xlsx | Bin 9178 -> 8702 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/public_service_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/public_service_template.xlsx index 893bdc99ceca4c5ce6862297de7757a3eeab9ddc..42c5b56207c0ae166226a57702622c32fa05aa66 100644 GIT binary patch literal 8702 zcmeHNgDv@TND$1{C0!xnN9GeCk}$>%jUTenE_v(^Gy^^6BXt#bDz~ z?C`XcDD{?tx>80Kaj&}SPDb6bBAJkT#Lh~t7eQ+Hln5a_V&!>TQWtCR1)cLbdrn|P z*Y~pQp7UeP?aT$`!Xndx#%S+F8@?%u_~P0ReCf`9(VOXtidhE{LoNz^#me+#VoKCT}Z*vK{O&bXEGXnO)Pg4eZE5(%r zR~&YG?2C}S6ps~Y-!7hIQ&jiO0X8-b=4C>da(@p5sQxY7une2cVIkqR42dQrKr@t) zv$?Gc8|(Koc~OvA?M+p3m_j|l@{7Dr!Dn9B0HF`fgvPfvOHCrPGZQXjPd?-wL- zu~eMc6|RHo;<6sqReH^(78OoaTKE$8c5^Yk=$4y~)e*>?^|77c$&xZs*BJlgr?3v# z(ogzClSVhMuY7t@#jYw9gdtv$@0Fp_MLc@#{BAugFCx>mn{;W;qjYeQcwpbZe9JWK z5p(cK?v+enUk$U!KXN@lB=OBDx2LVC{J6qKk4q_;A~^!;9&E;xco(ZnD5kw z#Kr&b1tF0_Cp&ugVc;S9hW$hdC1vV?ba0ck?~7Q))N(sa&ehE3ruSJ3A?8h|n3vCb zFYY*#_YZ7{JK?=6U~UDQzFpEHkFCS3j_ux`wE7{J?Qz&z1Swkfjd|#Wi_DjrKLd2ytfJW z7pQg%L_VMmU#SrbO6nu-HTW=@d{mvb7*hSu*qH5##1kC@lY(ipOXO`a z)VLU8f0}rgP0GQ=6!tY&iJN|g(uHHar1j;#-h`;47Raytdww*!N{SMI+&P6DXb>_$ zIP)u8BGuZyM_Ciq5n9|Kvz-;ZBAAXsY%h?OquRyt4<6kV4SAWG7CI}QYAU)LVY-o# za~~&LoGbC&oH68ad1x3n^WaG#IHTQ~23hi97nWL1LV~o>wyegcUb z-8c3!ABqTV>r&sMx)n@zSN{QT=`rbsTjz+9<$yC3Z>FHf$`c9Vx*7kL_5!T!l`&Ab@HAn zc+aX>a!6&tpJX~&Sn*3m4t!=qdS<~%?anYRzH(dqrBGJ~Q_|<{hF2U;$E%aJej|tv zfA_M_@L4c2#KU%w1N%=eyI4MTHaAmub+)p%aQPmX6v(LjjcQl^l}$VVJ!+UCAjgT`7EVLZBhTjrURd=#9@69MK)75Rq>ze}um5 z!bwyE$C@|Zqx6cE^*^LX-jw>ceYqU%|_BpYChq{M3l5gu<=Eo|bOop%T{yiK0?!D!f?96OPPFsVt%qV|( z&(+J;{D<2x+1<@X7n3tgIw6N(gOuOTR8_{~oy+c(1f`AZIS8Lq zc<&0lX;uRIMh+{Ke~gvHEMQF`8S*!+avu+z>nF?h{{%pKwDrKJMOgjMMU#}B` zi%$SHQ?8BYZiBb}Dt&#fWV;tIF%5#q`pZNof%6Yj@=l8awq&PU(Yz`xkbjD6L$>H~q9FoQ^q8 z(jRkmOIBV8-fXCf8(^B*&+#~oNWDoR4s<*}Mv`$#62e_yR~=%INfOwX{l=drGv-5D zYtbA=i~4*)nk#uCWdl*f#_SAElV6yqdk6`%%$VMxPm)R~Ha`8jI}I0Cm50gWz)o}B zncn6#fXX6ABi@m{X*FsXFdOOI>{M}4=NW8(CwI`LJ9{C9mN(0DVF_J2YNr*M9 zz)%qU^!gt`(o=P;C4#GaQ>M1oSye3r!;>L6DTzbd`#jxIF z#L}Z+m@^z)x-j1sHIVr^!tVFt)6D{JH1^&_lYx`>H5e&hJf&tWL(czd+wK`i?X#{% zv$h3uOIum4Sr(S>Q`@~%V^sO6)HCTZdAoC7S|& zq*C#^`)fi!_ALo)mPWYs%WlGELkByzU0lN;XCD`o<-&ur9Tvz_95mamCj*^fdY&$L6xa<9P!)@ymKPQn`3eK8+F~Hp_ZI6g zR;o;6;vGq3+tMVett|wrpWdB>Cx(h ztmtMla|bX{CU2$au;ub*L8YlB!}nsRPusqc{ix;sbk3p0ZyT;%M3>Y1>TE(ZL)7hYkQGyNrZAZHnMk? zF(-EnN}im}1y5YA3MV!D`I1O>iRQ)EvZ!E`fP$b~1a+p!nNh{8&UNQtOl!DX^uAeX zXa3EA@LeRtTgCQJKu)ym09u0$Zxcx z$`hu}#&lsTV0+ahySBx=ZIYby=mje9<=v3BY1NP51~$A)qs=uBD4^py=w0U-{CG_= zybbfTn3H@j$&ij(SiSLtU}?a;XL+@=&I?tm(;MqRlzvQ@8|+{@i?hqJ(lA$;dd5l$ z-M8*pr54>0CBCus%*HE$anYtauK9=+fqsFH;;G`Zgjx4kOBOiI*wZ`0zzy>E+UHtN zDoL1GnJ!*w6qf<4&9y!UueH?`uJY{|L(4eYNnpQZRPidro15zMNljkDRxE-p{Q5Y% z;DveKLd0(O`iH6YT=!^2J?cp33i++xEmB$&>@Qh@Q(In^jaDTK1Btq)8uSrQ@VRy0 z+(&guyP&ui&5Nn4Gg$7VyWVcN0~Kh+bb2yd_en%(2_~ae>GY(iJg;!%G8`^n(Sy4~ z_9!qmp=PoYio_+TH%MvZd$b4GCdAZ>DN^+8kYHBQX=dPbyk>gE$M>mM`(WV56&pCR zDAWC6Lq@9FuQXDPh(9vVA&(13c3?RuTHK-rV%k(%Grpj}_!^O)B+EtpRjVAk-2ASX zJ5R!WXeO{e^w>$N0w0H@3;Tq)B)2gqyX7?pdozwr=nFy$2ErBo$0*atg;PocC2=mZ zvu-22kK?$cT;{k~G}R0yicO}GU-5pz9C*d!6*NWJIm$YOnhCxrT&u>@t#MYSZ-9Ym zjLgj5&B&&}pG->7nZ#aoBhX4Qh@5XSEo zsZFn3wsp6f3z#8*HdgXIQiudYB|1W7jbVJIx=O7 z;9j4F+e`)3g0yMnuo=YUJ4Zu=6M}jph*3W^*fCP1;U7)vW++qQqH;6 zJ=n9HWf>IirswSmvcaf6hzZry9sbUWIT-z%%^VsK)A5; zmchu|gJI2Z&WxsUiF|*10uqVmV8W9MVp+(IaF2PVM$+!-v)bYQ15%%$3qzu z9Z3qB&6!K{=`!C2GVL6jEVulTEi`%?78a{g76mr4#tx3=hIfzN1dV;GnaCc=JyCgS z(Q-brOq^s)aJZi+123C@*wTLRWo>_J^Ws%P)41nm&t->D2&iMcZv9lO zDC`XlM#4pNsjD+eR+ikZa`N^Ujb{3NsL0(2ATyL6AZWc?j;xS{2-b;Lx*}*zO;?IY zzdcg1M#Luq!L=Gu9T${3uq{4xbh|ozh4fExM26D>G=TJ97La`d21E-nb1+qPc5rlI zGj(t_|5IfDR|0|L7eH{l(syw>t^6>SVVY+PBNakOi^wV$LPBA+U zU1I40l)qfUFgYr+_c#KPcQeAO<=UQ`-P!izlJkdRVq02pgd==A5@hfHHaE%$%#XKM zze%okdTHAxROV4yycbn8#i$!Kk1rzHhE}n=;6ACk^GusqH3Otv2erYN;P2b$+uU-U z@I}08&baSm>XrEjP1q|XKi0&_alwho+{>Ca^#uw+?y%OLtVML8bw5`xO+~egPI=63 zItl@nUIHad!k(C+o9A~*gC*~(8NSg(OU7e6NyrA1lAwhNi7jm`-4kB%K^*&g=fD5X zHZ&H($vX%q(SPOSQ%A>tDfyj@f3CFnHsw`z^w2}5eIco4_53O85XK%H#*f~!IIneU zi7dvS)ViCgWG7jyv_n}f8>=*;FdgA5V!qC6Ma+D*L3VfIWy>*FV)s}wth*r+1)c%i zYL!V;(?2_PJk!Sjreu7>v`b=U3m>PncHv+`>H`af(izOGKlmj4Nt8fLeQ;F-FrI`V z1kENSF%;)Q`YCtX^Cq1jNfCvKOyX(;)|awKDhkVG zm~!;`MP=a0d;|Krw1RLN*+5x(FP30}gpxr^DqRvxNa~zPA>|k_qS&3t8WojwoD>Rb ztF>@ZBGhAljLpk1*QsF;rbSLM;;+YkN~vbGGS!ntKE7}1+04Ir^Rgu{VQFgq)AD@G z5SoB35k0@XEwUggW;Eg(IF`-{w>I&2$-S0)3WG)GSG_>u-jf`3ZAe=Pwp#U_@{A zu0a39VxnMRGYf>ps1O!o{mNofHy2k2yMKxN-!ujQa^eiY9qiblhp_jOeZDC%)fFUm zvJ1B4hV=X%M&qtb-173{+vxWV1cF^i4yVVChNKx6X+CF^J)h|#Nh%ouh#UyPU+Re_ zn*k~dD2n3721WJmlM2|MshOX=p3%Mv8cSfeN9X;DV2Qm< zJsk5a#&sD@pMA)JAyE>074}Pon{N9y61<4#K=ut&`NXZQg~!6gn%lrFmLJG_JG2B) z%4~%Xc7)y*v>|WH3Drql6iYKvw3)Xpx4wf5+$PQ=S1mrBa!5_LAX#)y%P8iek>8cp zq{Ha8BGz_#-IbU(meR!o#$Sjf_O)L(Nm^#}B!V)f9#!)?q@17r~W`>(J5+otBBmA^M}KW#wT zIy?a2x0dc9{O|SlSNIJ?d;1Ukuj=~{{r5cgE4q#N7xd4prwWFJ(Bu1<841t^Nse@6 H-{1Wgy8fVC delta 7584 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 z Date: Fri, 12 Aug 2022 13:57:57 +0800 Subject: [PATCH 42/51] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?+=E6=B5=81=E8=BD=AC=E5=85=AC=E5=BC=80=E7=AD=94=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E9=99=90=E5=88=B6=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/ProjectResponseFormDTO.java | 3 +-- .../src/main/java/com/epmet/dto/form/TransferFormDTO.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java index 05402a071d..b47ee3aaab 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -30,7 +29,7 @@ public class ProjectResponseFormDTO implements Serializable { /** * 公开答复内容 */ - @NotBlank(message = "公开答复不能为空") + // @NotBlank(message = "公开答复不能为空") @Length(max = 1000, message = "公开答复不能超过1000个字符") private String publicReply; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java index ec3c6bd18a..5eb7013261 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java @@ -22,7 +22,7 @@ public class TransferFormDTO implements Serializable { @NotBlank(message = "项目人员关联Id不能为空") private String projectStaffId; - @NotBlank(message = "公开答复不能为空") + // @NotBlank(message = "公开答复不能为空") @Length(max=1000,message = "公开答复内容不能超过1000位") private String publicReply; From 68b21159988818fa85048df4ddd98a42e1e2efeb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 Aug 2022 14:09:31 +0800 Subject: [PATCH 43/51] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=85=AC=E5=BC=80=E7=AD=94=E5=A4=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/ProjectResponseFormDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java index b47ee3aaab..05402a071d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -29,7 +30,7 @@ public class ProjectResponseFormDTO implements Serializable { /** * 公开答复内容 */ - // @NotBlank(message = "公开答复不能为空") + @NotBlank(message = "公开答复不能为空") @Length(max = 1000, message = "公开答复不能超过1000个字符") private String publicReply; /** From ce432be4bd42bec343da76d4ed829da2bed08659 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 12 Aug 2022 17:44:49 +0800 Subject: [PATCH 44/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/CustomerAgencyDao.java | 8 +++ .../service/impl/IcWorkLogServiceImpl.java | 54 +++++++++++++------ .../db/migration/V0.0.43__alter_work_log.sql | 1 + .../resources/mapper/CustomerAgencyDao.xml | 14 +++++ 4 files changed, 61 insertions(+), 16 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.43__alter_work_log.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 3059b5a1cf..b54b4a28b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -376,5 +376,13 @@ public interface CustomerAgencyDao extends BaseDao { CustomerAgencyEntity getAreaRootAgency(@Param("customerId") String customerId); + /** + * @Description 根据人查询所在组织 + * @Param userId + * @author zhy + * @date 2021/8/5 10:08 上午 + */ + CustomerAgencyEntity getAgencyByUserId(@Param("userId") String userId, @Param("customerId") String customerId); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index 49d3a2b73a..e5ea8300db 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.CustomerAgencyDao; import com.epmet.dao.CustomerGridDao; import com.epmet.dao.IcWorkLogDao; import com.epmet.dto.CustomerStaffDTO; @@ -19,6 +20,7 @@ import com.epmet.dto.IcWorkLogDTO; import com.epmet.dto.IcWorkLogFileDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.result.GridDetailResultDTO; +import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.IcWorkLogEntity; import com.epmet.entity.IcWorkLogFileEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -64,6 +66,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl page(Map params) { @@ -132,14 +137,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl + + + From 19563fee8a59d781f776c4b5c01598f000d0cdca Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 15 Aug 2022 09:06:50 +0800 Subject: [PATCH 45/51] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcWorkLogServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java index e5ea8300db..ca65ac3ba4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java @@ -21,6 +21,7 @@ import com.epmet.dto.IcWorkLogFileDTO; import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.dto.result.GridDetailResultDTO; import com.epmet.entity.CustomerAgencyEntity; +import com.epmet.entity.CustomerGridEntity; import com.epmet.entity.IcWorkLogEntity; import com.epmet.entity.IcWorkLogFileEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -115,6 +116,11 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl params = new HashMap<>(2); params.put("logId", id); List files = icWorkLogFileService.list(params); From bb2a54bdf5d254f326d2f953593c7c34efc61522 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 16 Aug 2022 15:36:08 +0800 Subject: [PATCH 46/51] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BC=93=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 7 ++++ .../impl/CustomerStaffServiceImpl.java | 36 ++++++++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 76585fa96f..5dc667d21f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -849,4 +849,11 @@ public class RedisKeys { public static String getServiceOrgNameKey(String customerId,String serviceOrgType,String serviceOrgId){ return rootPrefix.concat("serviceOrgName:").concat(serviceOrgType).concat(":").concat(customerId).concat(":").concat(serviceOrgId); } + + public static String getUserBaseInfoKey(String userId) { + if (StringUtils.isBlank(userId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("userId"); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 0acbb46a51..1889fc659e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -29,6 +29,8 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; @@ -60,16 +62,16 @@ import com.epmet.service.UserService; import com.epmet.util.ModuleConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.RequestBody; import java.util.*; +import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; /** @@ -100,6 +102,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl page(Map params) { @@ -739,7 +745,28 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl selectStaffBasicInfo(String userId, String customerId) { - StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId); + StaffBasicInfoResultDTO resultDTO = null; + String userBaseInfoKey = RedisKeys.getUserBaseInfoKey(userId); + resultDTO = (StaffBasicInfoResultDTO)redisUtils.get(userBaseInfoKey); + if(resultDTO == null){ + resultDTO = getStaffBasicInfoResultDTO(userId, customerId, userBaseInfoKey); + } + //启用线程去查询 并替换redis + executorService.submit(() -> { + try { + getStaffBasicInfoResultDTO(userId, customerId, userBaseInfoKey); + } catch (Exception e) { + log.error("selectStaffBasicInfo exception", e); + } + }); + + return new Result().ok(resultDTO); + } + + @Nullable + private StaffBasicInfoResultDTO getStaffBasicInfoResultDTO(String userId, String customerId, String userBaseInfoKey) { + StaffBasicInfoResultDTO resultDTO; + resultDTO = baseDao.selectStaffBasicInfo(userId); if (null != resultDTO) { resultDTO.setRoleList(baseDao.selectStaffRoles(userId, resultDTO.getCustomerId())); CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); @@ -767,7 +794,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl().ok(resultDTO); + redisUtils.set(userBaseInfoKey,resultDTO); + return resultDTO; } /** From 2b67d821dff4906ddcc76659bc819958dc16967c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 16 Aug 2022 15:45:15 +0800 Subject: [PATCH 47/51] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BC=93=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/redis/RedisKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 5dc667d21f..b39bb7fa47 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -854,6 +854,6 @@ public class RedisKeys { if (StringUtils.isBlank(userId)){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); } - return rootPrefix.concat("userId"); + return rootPrefix.concat("staffbaseinfo:")+userId; } } From d8bca58feee22e721c6261d287bb8ee529a6ab00 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 10:24:40 +0800 Subject: [PATCH 48/51] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/govproject/ProjectDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 4b51beae89..29e53ff04b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -470,6 +470,9 @@ AND GRID_ID = #{orgId} + + AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%') + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} @@ -492,6 +495,9 @@ AND GRID_ID = #{orgId} + + AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%') + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} From 3621a34f4ec66b1f5ea131fd2f730b6263cf2fc7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 14:49:56 +0800 Subject: [PATCH 49/51] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E4=B8=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index f0fcfceefc..2741c72b45 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -524,7 +524,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { From 0bd762d55d6434886dbb60cc71adfab3b0260ac8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 15:36:51 +0800 Subject: [PATCH 50/51] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E4=B8=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/DataReportingServiceImpl.java | 1 - .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 6d76dfd175..c2a93796bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -386,7 +386,6 @@ public class DataReportingServiceImpl implements DataReportingService { case ProjectConstant.PENDING: return "01"; case ProjectConstant.CLOSED: - return "02"; case ProjectConstant.CLOSED_CASE: return "03"; default: diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2741c72b45..4d992085e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -524,8 +524,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { @@ -537,6 +536,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { + if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + } + } } if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) { From 8a5f74a6cf88a7bd15eb52f5627305e94cbfdbff Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 17 Aug 2022 15:51:19 +0800 Subject: [PATCH 51/51] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=B0=83=E6=95=B4=20=E5=8A=9E=E7=BB=93?= =?UTF-8?q?=E5=92=8C=E5=8C=96=E8=A7=A3=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/entity/EventreportPingyinEntity.java | 7 ++++++- .../service/impl/EventreportPingyinServiceImpl.java | 6 ++++-- .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java | 5 ++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java index 1298790b7c..79c2064f9d 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java @@ -91,10 +91,15 @@ public class EventreportPingyinEntity { private String waysOfResolving; /** - * 是否办结，填写Y、N（Y 是 N 否） + * 必填 是否化解，填写Y、N（Y 是 N 否） */ private String successfulOrNo; + /** + * 必填 是否办结，填写Y、N（Y 是 N 否） + */ + private String successfulDefuse; + /** * 办结层级，符合《标准》10.21 */ diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java index 380df961e4..0fe4ff1620 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java @@ -67,7 +67,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl> record = epmetUserOpenFeignClient.getPatrolRoutineWorkListV2(midPatrolFormDTO); if (record == null || !record.success()) { - log.error("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO)); + log.warn("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO)); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); } data = record.getData(); if (CollectionUtils.isEmpty(data)) { //数据已被删除了 - //暂时设置error 用于排错 - log.error("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO)); + log.warn("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO)); int effectRow = baseDao.deleteById(patrolRecordForm.getId()); log.warn("del effectRow:{}", effectRow); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());