wangxianzhang
3 years ago
95 changed files with 2638 additions and 72 deletions
@ -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<String> idList; |
|||
//数据类型【组织agency 网格grid】
|
|||
private String dataType; |
|||
|
|||
/** |
|||
* desc:是否是导出 |
|||
*/ |
|||
private boolean export = false; |
|||
} |
|||
@ -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; |
|||
|
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* 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. |
|||
* <p> |
|||
* 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. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
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<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO); |
|||
|
|||
} |
|||
@ -0,0 +1,68 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* 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. |
|||
* <p> |
|||
* 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. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
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; |
|||
|
|||
} |
|||
@ -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<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO); |
|||
|
|||
} |
|||
@ -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<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO) { |
|||
return resiPartymemberService.getNowPart(formDTO); |
|||
} |
|||
} |
|||
@ -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<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO); |
|||
|
|||
} |
|||
@ -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<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO) { |
|||
return resiPartymemberDao.getNowPart(formDTO); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,46 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
|
|||
<mapper namespace="com.epmet.dataaggre.dao.resipartymember.ResiPartymemberDao"> |
|||
|
|||
<select id="getNowPart" resultType="com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO"> |
|||
<choose> |
|||
<when test="dataType != null and dataType == 'agency' "> |
|||
SELECT |
|||
agency_id orgId, |
|||
agency_id_path pids |
|||
FROM partymember_register_relation |
|||
WHERE del_flag = '0' |
|||
AND first_register = '1' |
|||
AND customer_id = #{customerId} |
|||
<if test=" null != startTime and startTime != '' "> |
|||
AND created_time <![CDATA[ >= ]]> #{startTime} |
|||
</if> |
|||
<if test="null != endTime and endTime != '' "> |
|||
AND created_time <![CDATA[ <= ]]> #{endTime} |
|||
</if> |
|||
</when> |
|||
<otherwise> |
|||
SELECT |
|||
grid_id orgId, |
|||
SUM(first_register = '1') partyMemberCount |
|||
FROM |
|||
partymember_register_relation |
|||
WHERE |
|||
del_flag = '0' |
|||
AND customer_id = #{customerId} |
|||
<foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")"> |
|||
#{id} |
|||
</foreach> |
|||
<if test=" null != startTime and startTime != '' "> |
|||
AND created_time <![CDATA[ >= ]]> #{startTime} |
|||
</if> |
|||
<if test="null != endTime and endTime != '' "> |
|||
AND created_time <![CDATA[ <= ]]> #{endTime} |
|||
</if> |
|||
GROUP BY grid_id |
|||
</otherwise> |
|||
</choose> |
|||
</select> |
|||
|
|||
</mapper> |
|||
@ -0,0 +1,131 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
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; |
|||
|
|||
/** |
|||
* 组织Id |
|||
*/ |
|||
private String allAgencyName; |
|||
|
|||
/** |
|||
* agency_id的所有上级 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 网格Id【场所区域】 |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 网格Id【场所区域】 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
/** |
|||
* 标题 |
|||
*/ |
|||
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; |
|||
|
|||
/** |
|||
* 创建人名称 |
|||
*/ |
|||
private String createdUser; |
|||
|
|||
/** |
|||
* url |
|||
*/ |
|||
private String url; |
|||
|
|||
/** |
|||
* 附件 |
|||
*/ |
|||
private List<IcWorkLogFileDTO> fileList; |
|||
|
|||
} |
|||
@ -0,0 +1,89 @@ |
|||
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; |
|||
|
|||
/** |
|||
* 文件名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 文件类型，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; |
|||
|
|||
} |
|||
@ -0,0 +1,88 @@ |
|||
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; |
|||
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<PageData<IcWorkLogDTO>> page(@RequestParam Map<String, Object> params){ |
|||
PageData<IcWorkLogDTO> page = icWorkLogService.page(params); |
|||
return new Result<PageData<IcWorkLogDTO>>().ok(page); |
|||
} |
|||
|
|||
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) |
|||
public Result<IcWorkLogDTO> get(@PathVariable("id") String id){ |
|||
IcWorkLogDTO data = icWorkLogService.get(id); |
|||
return new Result<IcWorkLogDTO>().ok(data); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PostMapping |
|||
public Result save(@RequestBody IcWorkLogDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
icWorkLogService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PutMapping |
|||
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<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<IcWorkLogDTO> list = icWorkLogService.list4Export(params); |
|||
if(CollectionUtils.isEmpty(list)){ |
|||
IcWorkLogDTO dto = new IcWorkLogDTO(); |
|||
dto.setId(""); |
|||
list.add(dto); |
|||
} |
|||
ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogExcel.class); |
|||
} |
|||
|
|||
|
|||
|
|||
} |
|||
@ -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<PageData<IcWorkLogFileDTO>> page(@RequestParam Map<String, Object> params){ |
|||
PageData<IcWorkLogFileDTO> page = icWorkLogFileService.page(params); |
|||
return new Result<PageData<IcWorkLogFileDTO>>().ok(page); |
|||
} |
|||
|
|||
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) |
|||
public Result<IcWorkLogFileDTO> get(@PathVariable("id") String id){ |
|||
IcWorkLogFileDTO data = icWorkLogFileService.get(id); |
|||
return new Result<IcWorkLogFileDTO>().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<String, Object> params, HttpServletResponse response) throws Exception { |
|||
List<IcWorkLogFileDTO> list = icWorkLogFileService.list(params); |
|||
ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogFileExcel.class); |
|||
} |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,39 @@ |
|||
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; |
|||
|
|||
/** |
|||
* 网格员工作日志 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-08-05 |
|||
*/ |
|||
@Mapper |
|||
public interface IcWorkLogDao extends BaseDao<IcWorkLogEntity> { |
|||
|
|||
/** |
|||
* 分页列表 |
|||
* |
|||
* @param params |
|||
* @return java.util.List<com.epmet.dto.IcWorkLogDTO> |
|||
* @author zhy |
|||
* @date 2022/8/9 17:23 |
|||
*/ |
|||
List<IcWorkLogDTO> listPage(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 导出列表 |
|||
* |
|||
* @param params |
|||
* @return java.util.List<com.epmet.dto.IcWorkLogDTO> |
|||
* @author zhy |
|||
* @date 2022/8/9 17:23 |
|||
*/ |
|||
List<IcWorkLogDTO> list4Export(Map<String, Object> params); |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
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; |
|||
|
|||
/** |
|||
* 网格员工作日志附件 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-08-05 |
|||
*/ |
|||
@Mapper |
|||
public interface IcWorkLogFileDao extends BaseDao<IcWorkLogFileEntity> { |
|||
|
|||
/** |
|||
* 删除 |
|||
* |
|||
* @param logId |
|||
* @return void |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
void deleteByLogId(@Param("logId") String logId); |
|||
} |
|||
@ -0,0 +1,79 @@ |
|||
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; |
|||
|
|||
/** |
|||
* 创建人名称 |
|||
*/ |
|||
private String createdUser; |
|||
|
|||
} |
|||
@ -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; |
|||
|
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 网格员工作日志 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-08-05 |
|||
*/ |
|||
@Data |
|||
public class IcWorkLogExcel { |
|||
|
|||
@Excel(name = "网格员", width = 15) |
|||
private String createdUser; |
|||
|
|||
@Excel(name = "联系电话", width = 20) |
|||
private String mobile; |
|||
|
|||
@Excel(name = "所属镇街", width = 25) |
|||
private String allAgencyName; |
|||
|
|||
@Excel(name = "所属网格", width = 25) |
|||
private String gridName; |
|||
|
|||
@Excel(name = "标题", width = 25) |
|||
private String title; |
|||
|
|||
@Excel(name = "日志时间", width = 15) |
|||
private String logDate; |
|||
|
|||
@Excel(name = "日志类型", width = 15) |
|||
private String logType; |
|||
|
|||
@Excel(name = "内容", width = 100) |
|||
private String content; |
|||
|
|||
@Excel(name = "备注", width = 50) |
|||
private String remark; |
|||
|
|||
@Excel(name = "照片", width = 50) |
|||
private String url; |
|||
|
|||
} |
|||
@ -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; |
|||
|
|||
|
|||
} |
|||
@ -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; |
|||
} |
|||
|
|||
} |
|||
@ -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; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,88 @@ |
|||
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<IcWorkLogFileEntity> { |
|||
|
|||
/** |
|||
* 默认分页 |
|||
* |
|||
* @param params |
|||
* @return PageData<IcWorkLogFileDTO> |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
PageData<IcWorkLogFileDTO> page(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 默认查询 |
|||
* |
|||
* @param params |
|||
* @return java.util.List<IcWorkLogFileDTO> |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
List<IcWorkLogFileDTO> list(Map<String, Object> 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); |
|||
|
|||
/** |
|||
* 删除 |
|||
* |
|||
* @param logId |
|||
* @return void |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
void deleteByLogId(String logId); |
|||
} |
|||
@ -0,0 +1,88 @@ |
|||
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<IcWorkLogEntity> { |
|||
|
|||
/** |
|||
* 默认分页 |
|||
* |
|||
* @param params |
|||
* @return PageData<IcWorkLogDTO> |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
PageData<IcWorkLogDTO> page(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 默认查询 |
|||
* |
|||
* @param params |
|||
* @return java.util.List<IcWorkLogDTO> |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
List<IcWorkLogDTO> list(Map<String, Object> params); |
|||
|
|||
/** |
|||
* 查询 |
|||
* |
|||
* @param params |
|||
* @return java.util.List<IcWorkLogDTO> |
|||
* @author generator |
|||
* @date 2022-08-05 |
|||
*/ |
|||
List<IcWorkLogDTO> list4Export(Map<String, Object> 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); |
|||
} |
|||
@ -0,0 +1,95 @@ |
|||
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<IcWorkLogFileDao, IcWorkLogFileEntity> implements IcWorkLogFileService { |
|||
|
|||
@Autowired |
|||
private IcWorkLogFileRedis icWorkLogFileRedis; |
|||
|
|||
@Override |
|||
public PageData<IcWorkLogFileDTO> page(Map<String, Object> params) { |
|||
IPage<IcWorkLogFileEntity> page = baseDao.selectPage( |
|||
getPage(params, FieldConstant.CREATED_TIME, false), |
|||
getWrapper(params) |
|||
); |
|||
return getPageData(page, IcWorkLogFileDTO.class); |
|||
} |
|||
|
|||
@Override |
|||
public List<IcWorkLogFileDTO> list(Map<String, Object> params) { |
|||
List<IcWorkLogFileEntity> entityList = baseDao.selectList(getWrapper(params)); |
|||
|
|||
return ConvertUtils.sourceToTarget(entityList, IcWorkLogFileDTO.class); |
|||
} |
|||
|
|||
private QueryWrapper<IcWorkLogFileEntity> getWrapper(Map<String, Object> params){ |
|||
String id = (String)params.get(FieldConstant.ID_HUMP); |
|||
String logId = (String)params.get("logId"); |
|||
|
|||
QueryWrapper<IcWorkLogFileEntity> wrapper = new QueryWrapper<>(); |
|||
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|||
wrapper.eq(StringUtils.isNotBlank(logId), "LOG_ID", logId); |
|||
|
|||
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)); |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void deleteByLogId(String id) { |
|||
baseDao.deleteByLogId(id); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,226 @@ |
|||
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.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; |
|||
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; |
|||
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.CustomerGridEntity; |
|||
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; |
|||
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 javax.annotation.Resource; |
|||
import java.util.Arrays; |
|||
import java.util.HashMap; |
|||
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<IcWorkLogDao, IcWorkLogEntity> implements IcWorkLogService { |
|||
|
|||
@Autowired |
|||
private IcWorkLogRedis icWorkLogRedis; |
|||
|
|||
@Autowired |
|||
private LoginUserUtil loginUserUtil; |
|||
|
|||
@Autowired |
|||
private IcWorkLogFileService icWorkLogFileService; |
|||
|
|||
@Autowired |
|||
private EpmetUserFeignClient epmetUserFeignClient; |
|||
|
|||
@Autowired |
|||
private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; |
|||
|
|||
@Resource |
|||
private CustomerGridDao customerGridDao; |
|||
|
|||
@Resource |
|||
private CustomerAgencyDao customerAgencyDao; |
|||
|
|||
|
|||
@Override |
|||
public PageData<IcWorkLogDTO> page(Map<String, Object> params) { |
|||
params.put("customerId", loginUserUtil.getLoginUserCustomerId()); |
|||
params.put("createdBy", loginUserUtil.getLoginUserId()); |
|||
IPage<IcWorkLogDTO> page = getPage(params); |
|||
List<IcWorkLogDTO> list = baseDao.listPage(params); |
|||
return new PageData<>(list, page.getTotal()); |
|||
} |
|||
|
|||
@Override |
|||
public List<IcWorkLogDTO> list(Map<String, Object> params) { |
|||
List<IcWorkLogEntity> entityList = baseDao.selectList(getWrapper(params)); |
|||
|
|||
return ConvertUtils.sourceToTarget(entityList, IcWorkLogDTO.class); |
|||
} |
|||
|
|||
@Override |
|||
public List<IcWorkLogDTO> list4Export(Map<String, Object> params) { |
|||
params.put("customerId", loginUserUtil.getLoginUserCustomerId()); |
|||
params.put("createdBy", loginUserUtil.getLoginUserId()); |
|||
List<IcWorkLogDTO> list = baseDao.list4Export(params); |
|||
Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode()); |
|||
if (!result.success() || null == result.getData()) { |
|||
throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result)); |
|||
} else { |
|||
Map<String, String> logTypeMap = result.getData(); |
|||
list.forEach(item -> item.setLogType(logTypeMap.get(item.getLogType()))); |
|||
} |
|||
|
|||
return list; |
|||
} |
|||
|
|||
private QueryWrapper<IcWorkLogEntity> getWrapper(Map<String, Object> params) { |
|||
String id = (String) params.get(FieldConstant.ID_HUMP); |
|||
|
|||
QueryWrapper<IcWorkLogEntity> wrapper = new QueryWrapper<>(); |
|||
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|||
|
|||
return wrapper; |
|||
} |
|||
|
|||
@Override |
|||
public IcWorkLogDTO get(String id) { |
|||
IcWorkLogEntity entity = baseDao.selectById(id); |
|||
IcWorkLogDTO dto = ConvertUtils.sourceToTarget(entity, IcWorkLogDTO.class); |
|||
if (StringUtils.isNotBlank(entity.getGridId())) { |
|||
CustomerGridEntity grid = customerGridDao.selectById(entity.getGridId()); |
|||
dto.setGridName(grid.getGridName()); |
|||
} |
|||
|
|||
Map<String, Object> params = new HashMap<>(2); |
|||
params.put("logId", id); |
|||
List<IcWorkLogFileDTO> files = icWorkLogFileService.list(params); |
|||
files.forEach(item -> item.setName(item.getFileName())); |
|||
dto.setFileList(files); |
|||
return dto; |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void save(IcWorkLogDTO dto) { |
|||
dto.setCustomerId(loginUserUtil.getLoginUserCustomerId()); |
|||
//查询当前申请用户的基本信息
|
|||
CustomerStaffDTO customerStaffParam = new CustomerStaffDTO(); |
|||
customerStaffParam.setUserId(loginUserUtil.getLoginUserId()); |
|||
Result<CustomerStaffDTO> staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam); |
|||
if (!staffInfo.success() || null == staffInfo.getData()) { |
|||
throw new EpmetException("查询用户信息失败" + JSON.toJSONString(customerStaffParam)); |
|||
} else { |
|||
dto.setCreatedUser(staffInfo.getData().getRealName()); |
|||
dto.setMobile(staffInfo.getData().getMobile()); |
|||
} |
|||
// 组织机构处理
|
|||
orgHandle(dto); |
|||
|
|||
IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); |
|||
insert(entity); |
|||
|
|||
// 处理附件
|
|||
fileHandle(dto.getFileList(), entity.getId()); |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void update(IcWorkLogDTO dto) { |
|||
// 组织机构处理
|
|||
orgHandle(dto); |
|||
|
|||
IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class); |
|||
updateById(entity); |
|||
|
|||
// 处理附件
|
|||
icWorkLogFileService.deleteByLogId(entity.getId()); |
|||
fileHandle(dto.getFileList(), entity.getId()); |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void delete(String[] ids) { |
|||
// 逻辑删除（@TableLogic 注解）
|
|||
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|||
} |
|||
|
|||
/** |
|||
* 附件处理 |
|||
* |
|||
* @param fileList |
|||
* @param logId |
|||
* @return void |
|||
* @author zhy |
|||
* @date 2022/8/9 17:24 |
|||
*/ |
|||
private void fileHandle(List<IcWorkLogFileDTO> fileList, String logId) { |
|||
if (!fileList.isEmpty()) { |
|||
fileList.forEach(item -> { |
|||
item.setLogId(logId); |
|||
item.setCustomerId(loginUserUtil.getLoginUserCustomerId()); |
|||
item.setFileType(NumConstant.ZERO_STR); |
|||
}); |
|||
|
|||
List<IcWorkLogFileEntity> fileEntityList = ConvertUtils.sourceToTarget(fileList, IcWorkLogFileEntity.class); |
|||
icWorkLogFileService.insertBatch(fileEntityList); |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* 组织机构处理 |
|||
* |
|||
* @param dto |
|||
* @return |
|||
* @author zhy |
|||
* @date 2022/8/12 17:30 |
|||
*/ |
|||
private void orgHandle(IcWorkLogDTO dto) { |
|||
if (StringUtils.isNotBlank(dto.getGridId())) { |
|||
// 查询网格信息
|
|||
CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO(); |
|||
customerGridFormDTO.setGridId(dto.getGridId()); |
|||
GridDetailResultDTO gridDetailResultDTO = customerGridDao.griddetail(customerGridFormDTO); |
|||
if (gridDetailResultDTO != null) { |
|||
dto.setAgencyId(gridDetailResultDTO.getAgencyId()); |
|||
dto.setPids(gridDetailResultDTO.getPIds()); |
|||
} |
|||
} else { |
|||
CustomerAgencyEntity agency = customerAgencyDao.getAgencyByUserId(loginUserUtil.getLoginUserId(), loginUserUtil.getLoginUserCustomerId()); |
|||
if (agency != null) { |
|||
dto.setAgencyId(agency.getId()); |
|||
dto.setPids(agency.getPids()); |
|||
} |
|||
} |
|||
} |
|||
|
|||
} |
|||
@ -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; |
|||
@ -0,0 +1 @@ |
|||
ALTER TABLE epmet_gov_org.ic_work_log MODIFY COLUMN GRID_ID varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '网格Id【场所区域】'; |
|||
Binary file not shown.
@ -0,0 +1,118 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
|
|||
<mapper namespace="com.epmet.dao.IcWorkLogDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.IcWorkLogEntity" id="icWorkLogMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="agencyId" column="AGENCY_ID"/> |
|||
<result property="pids" column="PIDS"/> |
|||
<result property="gridId" column="GRID_ID"/> |
|||
<result property="title" column="TITLE"/> |
|||
<result property="logType" column="LOG_TYPE"/> |
|||
<result property="logDate" column="LOG_DATE"/> |
|||
<result property="content" column="CONTENT"/> |
|||
<result property="remark" column="REMARK"/> |
|||
<result property="mobile" column="MOBILE"/> |
|||
<result property="delFlag" column="DEL_FLAG"/> |
|||
<result property="revision" column="REVISION"/> |
|||
<result property="createdBy" column="CREATED_BY"/> |
|||
<result property="createdTime" column="CREATED_TIME"/> |
|||
<result property="updatedBy" column="UPDATED_BY"/> |
|||
<result property="updatedTime" column="UPDATED_TIME"/> |
|||
</resultMap> |
|||
|
|||
|
|||
<select id="listPage" resultType="com.epmet.dto.IcWorkLogDTO"> |
|||
SELECT |
|||
* |
|||
FROM |
|||
ic_work_log wl |
|||
WHERE |
|||
wl.DEL_FLAG = '0' |
|||
AND wl.CUSTOMER_ID = #{customerId} |
|||
<if test="logType != null and logType != '' "> |
|||
AND wl.LOG_TYPE = #{logType} |
|||
</if> |
|||
<if test="createdUser != null and createdUser != '' "> |
|||
AND wl.created_user = #{createdUser} |
|||
</if> |
|||
<if test="gridId != null and gridId != '' "> |
|||
AND wl.GRID_ID = #{gridId} |
|||
</if> |
|||
<if test="agencyId != null and agencyId != '' "> |
|||
AND (wl.AGENCY_ID = #{agencyId} |
|||
OR wl.PIDS LIKE concat('%',#{agencyId}, '%' )) |
|||
</if> |
|||
<if test="mobile != null and mobile != '' "> |
|||
AND wl.MOBILE = #{mobile} |
|||
</if> |
|||
<if test="isSelf != null and isSelf != ''"> |
|||
<if test="isSelf == '1' or isSelf == 1"> |
|||
AND wl.CREATED_BY = #{createdBy} |
|||
</if> |
|||
</if> |
|||
<if test="startTime != null and startTime != '' "> |
|||
AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime} |
|||
</if> |
|||
<if test="endTime != null and endTime != '' "> |
|||
AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) <= #{endTime} |
|||
</if> |
|||
ORDER BY wl.CREATED_TIME DESC |
|||
</select> |
|||
|
|||
<select id="list4Export" resultType="com.epmet.dto.IcWorkLogDTO"> |
|||
SELECT |
|||
wl.CREATED_USER, |
|||
wl.MOBILE, |
|||
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, |
|||
wl.LOG_TYPE, |
|||
wl.CONTENT, |
|||
wl.REMARK, |
|||
GROUP_CONCAT( f.URL ) AS url |
|||
FROM |
|||
ic_work_log wl |
|||
LEFT JOIN customer_grid g ON wl.GRID_ID = g.id |
|||
LEFT JOIN customer_agency a ON wl.AGENCY_ID = a.id |
|||
LEFT JOIN ic_work_log_file f ON f.LOG_ID = wl.id |
|||
WHERE |
|||
wl.DEL_FLAG = '0' |
|||
AND wl.CUSTOMER_ID = #{customerId} |
|||
<if test="logType != null and logType != '' "> |
|||
AND wl.LOG_TYPE = #{logType} |
|||
</if> |
|||
<if test="createdUser != null and createdUser != '' "> |
|||
AND wl.created_user = #{createdUser} |
|||
</if> |
|||
<if test="gridId != null and gridId != '' "> |
|||
AND wl.GRID_ID = #{gridId} |
|||
</if> |
|||
<if test="agencyId != null and agencyId != '' "> |
|||
AND (wl.AGENCY_ID = #{agencyId} |
|||
OR wl.PIDS LIKE concat('%',#{agencyId}, '%' )) |
|||
</if> |
|||
<if test="mobile != null and mobile != '' "> |
|||
AND wl.MOBILE = #{mobile} |
|||
</if> |
|||
<if test="isSelf != null and isSelf != '' and isSelf == '1' "> |
|||
AND wl.CREATED_BY = #{createdBy} |
|||
</if> |
|||
<if test="startTime != null and startTime != '' "> |
|||
AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime} |
|||
</if> |
|||
<if test="endTime != null and endTime != '' "> |
|||
AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) <= #{endTime} |
|||
</if> |
|||
GROUP BY |
|||
wl.id, wl.CREATED_TIME |
|||
ORDER BY wl.CREATED_TIME DESC |
|||
</select> |
|||
</mapper> |
|||
@ -0,0 +1,30 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
|
|||
<mapper namespace="com.epmet.dao.IcWorkLogFileDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.IcWorkLogFileEntity" id="icWorkLogFileMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="logId" column="LOG_ID"/> |
|||
<result property="url" column="URL"/> |
|||
<result property="fileName" column="FILE_NAME"/> |
|||
<result property="fileType" column="FILE_TYPE"/> |
|||
<result property="sort" column="SORT"/> |
|||
<result property="delFlag" column="DEL_FLAG"/> |
|||
<result property="revision" column="REVISION"/> |
|||
<result property="createdBy" column="CREATED_BY"/> |
|||
<result property="createdTime" column="CREATED_TIME"/> |
|||
<result property="updatedBy" column="UPDATED_BY"/> |
|||
<result property="updatedTime" column="UPDATED_TIME"/> |
|||
</resultMap> |
|||
|
|||
|
|||
<delete id="deleteByLogId"> |
|||
DELETE |
|||
FROM |
|||
ic_work_log_file |
|||
WHERE |
|||
LOG_ID = #{logId} |
|||
</delete> |
|||
</mapper> |
|||
@ -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; |
|||
} |
|||
|
|||
@ -0,0 +1 @@ |
|||
alter table ic_resi_user add COLUMN IS_XJC CHAR(1) DEFAULT'0' COMMENT '是否新阶层人士【是:1 否:0】'after IS_FLOATING; |
|||
Binary file not shown.
Loading…
Reference in new issue