forked from luyan/epmet-cloud-lingshan
wxz
2 years ago
431 changed files with 19503 additions and 886 deletions
@ -0,0 +1,15 @@ |
|||
package com.epmet.dataaggre.dto.epmetuser.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2023/5/19 9:23 |
|||
*/ |
|||
@Data |
|||
public class LingShanLianHuResiUserFormDTO extends PageFormDTO { |
|||
private String partyCenterHouseId; |
|||
} |
|||
|
|||
@ -0,0 +1,17 @@ |
|||
package com.epmet.dataaggre.dto.epmetuser.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2023/5/19 9:52 |
|||
*/ |
|||
@Data |
|||
public class IcResiUserResultDTO { |
|||
private String icResiUserId; |
|||
private String name; |
|||
private String mobile; |
|||
private String homeId; |
|||
} |
|||
|
|||
@ -0,0 +1,36 @@ |
|||
package com.epmet.dataaggre.dto.epmetuser.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Description 灵山大屏-党员中共新户联户群众列表 |
|||
* @Author yzm |
|||
* @Date 2023/5/19 9:10 |
|||
*/ |
|||
@Data |
|||
public class LingShanLianHuResiUserResultDTO extends IcResiUserResultDTO{ |
|||
/** |
|||
* 与入参一致 |
|||
* 党员中心户房屋id, |
|||
*/ |
|||
private String partyCenterHouseId; |
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
private String partyCenterHouseOwnerName; |
|||
// 关联的房屋信息
|
|||
private String neighborHoodId; |
|||
private String neighborHoodName; |
|||
private String buildingId; |
|||
private String buildingName; |
|||
private String buildingUnitId; |
|||
private String unitName; |
|||
private String doorName; |
|||
private String houseId; |
|||
|
|||
// // 每个房屋里住的居民
|
|||
// private List<IcResiUserResultDTO> resiList;
|
|||
|
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 人员名单 |
|||
* @Author yzm |
|||
* @Date 2023/3/29 13:42 |
|||
*/ |
|||
@Data |
|||
public class PartyActivitySignUpRecordFormDTO extends PageFormDTO implements Serializable { |
|||
/** |
|||
* 联建活动ID |
|||
*/ |
|||
@NotBlank(message = "activityId不能为空", groups = AddUserInternalGroup.class) |
|||
private String activityId; |
|||
} |
|||
|
|||
@ -0,0 +1,25 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.QueryGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2023/3/29 15:27 |
|||
*/ |
|||
@Data |
|||
public class SignUpParyActFormDTO { |
|||
/** |
|||
* |
|||
*/ |
|||
@NotBlank(message = "userId不能为空", groups = QueryGroup.class) |
|||
private String userId; |
|||
@NotBlank(message = "activityId不能为空", groups = QueryGroup.class) |
|||
private String activityId; |
|||
@NotBlank(message = "gridId不能为空", groups = QueryGroup.class) |
|||
private String gridId; |
|||
} |
|||
|
|||
@ -0,0 +1,46 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description 居民端钉钉，查看联建活动详情 |
|||
* @Author yzm |
|||
* @Date 2023/3/29 15:59 |
|||
*/ |
|||
@Data |
|||
public class PartyActivityResDTO { |
|||
private String activityId; |
|||
private String agencyName; |
|||
private String agencyId; |
|||
private List<String> unitNameList; |
|||
private List<String> serviceMatterNameList; |
|||
private String title; |
|||
private String target; |
|||
private String content; |
|||
private Integer peopleCount; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date activityTime; |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date activityEndTime; |
|||
private String coverUrl; |
|||
private String address; |
|||
private String result; |
|||
/** |
|||
* 报名记录id |
|||
*/ |
|||
private String signUpId; |
|||
/** |
|||
* 已报名总人数 |
|||
*/ |
|||
private Integer signUpCount; |
|||
/** |
|||
* 是否报名:true：已报名；false：未报名 |
|||
*/ |
|||
private Boolean signUpFlag; |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,61 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 联建活动报名记录表(烟台需求) |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-03-29 |
|||
*/ |
|||
@Data |
|||
public class PartyActivitySignUpRecordResDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 联建活动ID |
|||
*/ |
|||
private String activityId; |
|||
|
|||
/** |
|||
* 居民端用户id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String userName; |
|||
private String mobile; |
|||
/** |
|||
* 报名时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date signUpTime; |
|||
|
|||
/** |
|||
* 用户报名时所在的网格 |
|||
*/ |
|||
private String gridId; |
|||
/** |
|||
* 网格名称：XXX社区-xxx网格 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.result.PartyActivitySignUpRecordResDTO; |
|||
import com.epmet.entity.IcPartyActivitySignUpRecordEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 联建活动报名记录表(烟台需求) |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-03-29 |
|||
*/ |
|||
@Mapper |
|||
public interface IcPartyActivitySignUpRecordDao extends BaseDao<IcPartyActivitySignUpRecordEntity> { |
|||
/** |
|||
* 人员名单 |
|||
* @param activityId |
|||
* @return |
|||
*/ |
|||
List<PartyActivitySignUpRecordResDTO> querySignUpRecord(String activityId); |
|||
} |
|||
@ -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 2023-03-29 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("ic_party_activity_sign_up_record") |
|||
public class IcPartyActivitySignUpRecordEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 联建活动ID |
|||
*/ |
|||
private String activityId; |
|||
|
|||
/** |
|||
* 居民端用户id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String userName; |
|||
private String mobile; |
|||
/** |
|||
* 报名时间 |
|||
*/ |
|||
private Date signUpTime; |
|||
|
|||
/** |
|||
* 用户报名时所在的网格 |
|||
*/ |
|||
private String gridId; |
|||
private String gridName; |
|||
} |
|||
@ -0,0 +1,40 @@ |
|||
<?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.IcPartyActivitySignUpRecordDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.IcPartyActivitySignUpRecordEntity" id="icPartyActivitySignUpRecordMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="activityId" column="ACTIVITY_ID"/> |
|||
<result property="userId" column="USER_ID"/> |
|||
<result property="userName" column="USER_NAME"/> |
|||
<result property="signUpTime" column="SIGN_UP_TIME"/> |
|||
<result property="gridId" column="GRID_ID"/> |
|||
<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="querySignUpRecord" parameterType="java.lang.String" resultType="com.epmet.dto.result.PartyActivitySignUpRecordResDTO"> |
|||
SELECT |
|||
m.ID, |
|||
m.CUSTOMER_ID, |
|||
m.ACTIVITY_ID, |
|||
m.USER_ID, |
|||
m.USER_NAME, |
|||
m.MOBILE, |
|||
m.GRID_ID, |
|||
m.GRID_NAME, |
|||
m.SIGN_UP_TIME |
|||
FROM |
|||
ic_party_activity_sign_up_record m |
|||
WHERE |
|||
m.ACTIVITY_ID = #{activityId} |
|||
ORDER BY |
|||
m.SIGN_UP_TIME DESC |
|||
</select> |
|||
</mapper> |
|||
Binary file not shown.
@ -0,0 +1,43 @@ |
|||
package com.epmet.task; |
|||
|
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.form.DataSyncTaskParam; |
|||
import com.epmet.feign.EpmetUserOpenFeignClient; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* @Description:死亡 |
|||
* @Return |
|||
* @Author: lichao |
|||
* @Date: 2023/5/19 13:47 |
|||
*/ |
|||
@Slf4j |
|||
@Component("resiDeadTask") |
|||
public class ResiDeadTask implements ITask { |
|||
|
|||
@Autowired |
|||
private EpmetUserOpenFeignClient userOpenFeignClient; |
|||
|
|||
@Override |
|||
public void run(String params) { |
|||
DataSyncTaskParam formDTO = new DataSyncTaskParam(); |
|||
if (StringUtils.isNotBlank(params)) { |
|||
formDTO = JSON.parseObject(params, DataSyncTaskParam.class); |
|||
} |
|||
formDTO.setCustomerId(""); |
|||
|
|||
// 死亡
|
|||
Result maritalInfoScanTask = userOpenFeignClient.deathInfoScanTask(formDTO); |
|||
if (maritalInfoScanTask.success()) { |
|||
log.info("resiDeadTask定时任务执行成功"); |
|||
} else { |
|||
log.error("resiDeadTask定时任务执行失败:" + maritalInfoScanTask.getMsg()); |
|||
} |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,43 @@ |
|||
package com.epmet.task; |
|||
|
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.form.DataSyncTaskParam; |
|||
import com.epmet.feign.EpmetUserOpenFeignClient; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* @Description:婚姻状况 |
|||
* @Return |
|||
* @Author: lichao |
|||
* @Date: 2023/5/19 13:47 |
|||
*/ |
|||
@Slf4j |
|||
@Component("resiMaritalTask") |
|||
public class ResiMaritalTask implements ITask { |
|||
|
|||
@Autowired |
|||
private EpmetUserOpenFeignClient userOpenFeignClient; |
|||
|
|||
@Override |
|||
public void run(String params) { |
|||
DataSyncTaskParam formDTO = new DataSyncTaskParam(); |
|||
if (StringUtils.isNotBlank(params)) { |
|||
formDTO = JSON.parseObject(params, DataSyncTaskParam.class); |
|||
} |
|||
formDTO.setCustomerId(""); |
|||
|
|||
// 婚姻
|
|||
Result maritalInfoScanTask = userOpenFeignClient.maritalInfoScanTask(formDTO); |
|||
if (maritalInfoScanTask.success()) { |
|||
log.info("resiMaritalTask定时任务执行成功"); |
|||
} else { |
|||
log.error("resiMaritalTask定时任务执行失败:" + maritalInfoScanTask.getMsg()); |
|||
} |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,52 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
|
|||
import javax.validation.Valid; |
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotEmpty; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* 组织发布消息（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@Data |
|||
public class OrganizationMessageFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
public interface AddShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
/** |
|||
* 发布渠道：0：专属app |
|||
*/ |
|||
@NotBlank(message = "发布渠道不能为空", groups = {AddShowGroup.class}) |
|||
private String publishDitch; |
|||
|
|||
/** |
|||
* 消息内容；最多输入500 |
|||
*/ |
|||
@NotBlank(message = "内容不能为空", groups = {AddShowGroup.class}) |
|||
@Length(max = 500, message = "内容输入500字", groups = {AddShowGroup.class}) |
|||
private String content; |
|||
|
|||
@Valid |
|||
@NotEmpty(message = "发布范围不能为空", groups = {AddShowGroup.class}) |
|||
private List<OrganizationMessagePublishRangeDTO> rangeList; |
|||
|
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
/** |
|||
* 发布人staffId |
|||
*/ |
|||
private String publishStaffId; |
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 消息发布范围（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@Data |
|||
public class OrganizationMessagePublishRangeDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 消息id:organization_message.id |
|||
*/ |
|||
private String messageId; |
|||
|
|||
/** |
|||
* 组织或者网格id |
|||
*/ |
|||
@NotBlank(message = "orgId不能为空",groups = {OrganizationMessageFormDTO.AddShowGroup.class}) |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 组织：agency；网格：grid |
|||
*/ |
|||
@NotBlank(message = "orgType不能为空",groups = {OrganizationMessageFormDTO.AddShowGroup.class}) |
|||
private String orgType; |
|||
|
|||
/** |
|||
* org_id的父级 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* org_id的全路径，包含org_id |
|||
*/ |
|||
private String orgIdPath; |
|||
|
|||
/** |
|||
* 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Description 烟台消息管理，列表查询入参 |
|||
* @Author yzm |
|||
* @Date 2023/5/4 16:05 |
|||
*/ |
|||
@Data |
|||
public class OrganizationMessagePageFormDTO extends PageFormDTO { |
|||
/** |
|||
* 发布渠道：0：专属app |
|||
*/ |
|||
private String publishDitch; |
|||
/** |
|||
* 发布范围，组织id或者网格id |
|||
*/ |
|||
private String orgId; |
|||
/** |
|||
* yyyy-MM-dd |
|||
*/ |
|||
private String startDate; |
|||
/** |
|||
* yyyy-MM-dd |
|||
*/ |
|||
private String endDate; |
|||
} |
|||
|
|||
@ -0,0 +1,84 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.dto.OrganizationMessagePublishRangeDTO; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description 烟台消息管理，列表查询 |
|||
* @Author yzm |
|||
* @Date 2023/5/4 16:06 |
|||
*/ |
|||
@Data |
|||
public class OrganizationMessageResultDTO { |
|||
/** |
|||
* 消息id |
|||
*/ |
|||
private String messageId; |
|||
|
|||
/** |
|||
* 发布渠道：0：专属app |
|||
*/ |
|||
private String publishDitch; |
|||
|
|||
/** |
|||
* 消息内容；最多输入500 |
|||
*/ |
|||
private String content; |
|||
/** |
|||
* 发布范围 |
|||
*/ |
|||
private String publishRangeName; |
|||
|
|||
/** |
|||
* 发布时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date publishTime; |
|||
|
|||
/** |
|||
* 发布人staffId |
|||
*/ |
|||
private String publishStaffId; |
|||
|
|||
/** |
|||
* 发布人姓名 |
|||
*/ |
|||
private String publishStaffName; |
|||
|
|||
/** |
|||
* 发布人所属组织id |
|||
*/ |
|||
private String publishOrgId; |
|||
|
|||
/** |
|||
* org_id_path |
|||
*/ |
|||
private String publishOrgIdPath; |
|||
|
|||
/** |
|||
* 发布人所属组织名称 |
|||
*/ |
|||
private String publishOrgName; |
|||
|
|||
/** |
|||
* 发送结果 |
|||
*/ |
|||
private String sendMsgRes; |
|||
/** |
|||
* 共发送出多少条消息 |
|||
*/ |
|||
private Integer totalReceiver; |
|||
|
|||
/** |
|||
* 发送完成时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date finishSendTime; |
|||
|
|||
private List<OrganizationMessagePublishRangeDTO> rangeList; |
|||
} |
|||
|
|||
@ -0,0 +1,76 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.dto.OrganizationMessageFormDTO; |
|||
import com.epmet.dto.form.OrganizationMessagePageFormDTO; |
|||
import com.epmet.dto.result.OrganizationMessageResultDTO; |
|||
import com.epmet.service.OrganizationMessageService; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
|
|||
/** |
|||
* 组织发布消息（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("organization/message") |
|||
public class OrganizationMessageController { |
|||
|
|||
@Autowired |
|||
private OrganizationMessageService organizationMessageService; |
|||
|
|||
/** |
|||
* 列表查询 |
|||
* |
|||
* @param formDTO |
|||
* @return |
|||
*/ |
|||
@PostMapping("list") |
|||
public Result<PageData<OrganizationMessageResultDTO>> pageList(@RequestBody OrganizationMessagePageFormDTO formDTO) { |
|||
return new Result<PageData<OrganizationMessageResultDTO>>().ok(organizationMessageService.pageList(formDTO.getPageNo(), formDTO.getPageSize(), |
|||
formDTO.getPublishDitch(), |
|||
formDTO.getOrgId(), |
|||
formDTO.getStartDate(), |
|||
formDTO.getEndDate())); |
|||
} |
|||
|
|||
/** |
|||
* 查询消息详情 |
|||
* |
|||
* @param messageId |
|||
* @return |
|||
*/ |
|||
@PostMapping("detail/{messageId}") |
|||
public Result<OrganizationMessageResultDTO> getDetail(@PathVariable("messageId") String messageId) { |
|||
if (StringUtils.isBlank(messageId)) { |
|||
return new Result<>(); |
|||
} |
|||
return new Result<OrganizationMessageResultDTO>().ok(organizationMessageService.getDetail(messageId)); |
|||
} |
|||
|
|||
/** |
|||
* 发布消息 |
|||
* |
|||
* @param formDTO |
|||
* @return 返回消息id |
|||
*/ |
|||
@PostMapping("publish") |
|||
public Result publish(@LoginUser TokenDto tokenDto, @RequestBody OrganizationMessageFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
formDTO.setPublishStaffId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, OrganizationMessageFormDTO.AddShowGroup.class); |
|||
String messageId=organizationMessageService.publish(formDTO); |
|||
// 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息
|
|||
organizationMessageService.sendUserMsg(messageId,formDTO.getContent(),formDTO.getPublishStaffId(),formDTO.getRangeList(),formDTO.getCustomerId()); |
|||
return new Result().ok(messageId); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.result.OrganizationMessageResultDTO; |
|||
import com.epmet.entity.OrganizationMessageEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 组织发布消息（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@Mapper |
|||
public interface OrganizationMessageDao extends BaseDao<OrganizationMessageEntity> { |
|||
|
|||
/** |
|||
* |
|||
* @param staffOrgIdPath 工作人员所属组织的orgIdPath |
|||
* @param publishDitch 发布渠道；0：专属app |
|||
* @param orgId 发布范围，组织id或者网格id |
|||
* @param startDate yyyy-MM-dd |
|||
* @param endDate yyyy-MM-dd |
|||
* @return |
|||
*/ |
|||
List<OrganizationMessageResultDTO> pageList(@Param("customerId")String customerId, |
|||
@Param("staffOrgIdPath") String staffOrgIdPath, |
|||
@Param("publishDitch")String publishDitch, |
|||
@Param("orgId")String orgId, |
|||
@Param("startDate")String startDate, |
|||
@Param("endDate")String endDate, |
|||
@Param("messageId")String messageId); |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.entity.OrganizationMessagePublishRangeEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
/** |
|||
* 消息发布范围（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@Mapper |
|||
public interface OrganizationMessagePublishRangeDao extends BaseDao<OrganizationMessagePublishRangeEntity> { |
|||
|
|||
} |
|||
@ -0,0 +1,82 @@ |
|||
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 2023-05-04 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("organization_message") |
|||
public class OrganizationMessageEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 发布渠道：0：专属app |
|||
*/ |
|||
private String publishDitch; |
|||
|
|||
/** |
|||
* 消息内容；最多输入500 |
|||
*/ |
|||
private String content; |
|||
|
|||
/** |
|||
* 发布人staffId |
|||
*/ |
|||
private String publishStaffId; |
|||
|
|||
/** |
|||
* 发布人姓名 |
|||
*/ |
|||
private String publishStaffName; |
|||
|
|||
/** |
|||
* 发布人所属组织id |
|||
*/ |
|||
private String publishOrgId; |
|||
|
|||
/** |
|||
* org_id_path |
|||
*/ |
|||
private String publishOrgIdPath; |
|||
|
|||
/** |
|||
* 发布人所属组织名称 |
|||
*/ |
|||
private String publishOrgName; |
|||
|
|||
/** |
|||
* 发布时间 |
|||
*/ |
|||
private Date publishTime; |
|||
/** |
|||
* 发送结果 |
|||
* sending发送中；failed失败；success成功 |
|||
*/ |
|||
private String sendMsgRes; |
|||
/** |
|||
* 共发送出多少条消息 |
|||
*/ |
|||
private Integer totalReceiver; |
|||
|
|||
/** |
|||
* 发送完成时间 |
|||
*/ |
|||
private Date finishSendTime; |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.epmet.entity; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
/** |
|||
* 消息发布范围（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("organization_message_publish_range") |
|||
public class OrganizationMessagePublishRangeEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 消息id:organization_message.id |
|||
*/ |
|||
private String messageId; |
|||
|
|||
/** |
|||
* 组织或者网格id |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 组织：agency；网格：grid |
|||
*/ |
|||
private String orgType; |
|||
|
|||
/** |
|||
* org_id的父级 |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* org_id的全路径，包含org_id |
|||
*/ |
|||
private String orgIdPath; |
|||
|
|||
/** |
|||
* 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
package com.epmet.service; |
|||
|
|||
import com.epmet.commons.mybatis.service.BaseService; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.dto.OrganizationMessageFormDTO; |
|||
import com.epmet.dto.OrganizationMessagePublishRangeDTO; |
|||
import com.epmet.dto.result.OrganizationMessageResultDTO; |
|||
import com.epmet.entity.OrganizationMessageEntity; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 组织发布消息（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
public interface OrganizationMessageService extends BaseService<OrganizationMessageEntity> { |
|||
|
|||
/** |
|||
* 分页列表 |
|||
* @param pageNo |
|||
* @param pageSize |
|||
* @param publishDitch 发布渠道；0：专属app |
|||
* @param orgId 发布范围，组织id或者网格id |
|||
* @param startDate yyyy-MM-dd |
|||
* @param endDate yyyy-MM-dd |
|||
* @return |
|||
*/ |
|||
PageData<OrganizationMessageResultDTO> pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate); |
|||
|
|||
/** |
|||
* 查询详情 |
|||
* @param messageId |
|||
* @return |
|||
*/ |
|||
OrganizationMessageResultDTO getDetail(String messageId); |
|||
|
|||
/** |
|||
* 发布消息 |
|||
* @param formDTO |
|||
* @return 返回消息id |
|||
*/ |
|||
String publish(OrganizationMessageFormDTO formDTO); |
|||
|
|||
void sendUserMsg(String messageId, String content, String publishStaffId, List<OrganizationMessagePublishRangeDTO> rangeList, String customerId); |
|||
} |
|||
@ -0,0 +1,219 @@ |
|||
package com.epmet.service.impl; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|||
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|||
import com.epmet.commons.tools.constant.AppClientConstant; |
|||
import com.epmet.commons.tools.constant.Constant; |
|||
import com.epmet.commons.tools.constant.NumConstant; |
|||
import com.epmet.commons.tools.constant.StrConstant; |
|||
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; |
|||
import com.epmet.commons.tools.enums.OrgTypeEnum; |
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
import com.epmet.commons.tools.exception.EpmetException; |
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.redis.common.CustomerOrgRedis; |
|||
import com.epmet.commons.tools.redis.common.CustomerStaffRedis; |
|||
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; |
|||
import com.epmet.commons.tools.redis.common.bean.GridInfoCache; |
|||
import com.epmet.commons.tools.utils.*; |
|||
import com.epmet.dao.OrganizationMessageDao; |
|||
import com.epmet.dao.OrganizationMessagePublishRangeDao; |
|||
import com.epmet.dao.UserMessageDao; |
|||
import com.epmet.dto.OrganizationMessageFormDTO; |
|||
import com.epmet.dto.OrganizationMessagePublishRangeDTO; |
|||
import com.epmet.dto.RegisterRelationDTO; |
|||
import com.epmet.dto.form.RegisterRelationPageFormDTO; |
|||
import com.epmet.dto.result.OrganizationMessageResultDTO; |
|||
import com.epmet.entity.OrganizationMessageEntity; |
|||
import com.epmet.entity.OrganizationMessagePublishRangeEntity; |
|||
import com.epmet.entity.UserMessageEntity; |
|||
import com.epmet.feign.EpmetUserOpenFeignClient; |
|||
import com.epmet.service.OrganizationMessageService; |
|||
import com.github.pagehelper.PageHelper; |
|||
import com.github.pagehelper.PageInfo; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.collections4.CollectionUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.scheduling.annotation.Async; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 组织发布消息（烟台） |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-05-04 |
|||
*/ |
|||
@Slf4j |
|||
@Service |
|||
public class OrganizationMessageServiceImpl extends BaseServiceImpl<OrganizationMessageDao, OrganizationMessageEntity> implements OrganizationMessageService { |
|||
@Autowired |
|||
private OrganizationMessagePublishRangeDao organizationMessagePublishRangeDao; |
|||
@Autowired |
|||
private UserMessageDao userMessageDao; |
|||
@Autowired |
|||
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|||
|
|||
|
|||
/** |
|||
* 分页列表 |
|||
* |
|||
* @param pageNo |
|||
* @param pageSize |
|||
* @param publishDitch 发布渠道；0：专属app |
|||
* @param orgId 发布范围，组织id或者网格id |
|||
* @param startDate yyyy-MM-dd |
|||
* @param endDate yyyy-MM-dd |
|||
* @return |
|||
*/ |
|||
@Override |
|||
public PageData<OrganizationMessageResultDTO> pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { |
|||
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); |
|||
if (null == staffInfoCacheResult) { |
|||
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customerId:" + EpmetRequestHolder.getLoginUserCustomerId() + "staffId:" + EpmetRequestHolder.getLoginUserId(), "获取工作人员信息异常"); |
|||
} |
|||
String staffOrgIdPath = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); |
|||
PageHelper.startPage(pageNo, pageSize); |
|||
List<OrganizationMessageResultDTO> list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); |
|||
PageInfo<OrganizationMessageResultDTO> pageInfo = new PageInfo<>(list); |
|||
return new PageData<>(list, pageInfo.getTotal(),pageSize); |
|||
} |
|||
|
|||
/** |
|||
* 查询详情 |
|||
* |
|||
* @param messageId |
|||
* @return |
|||
*/ |
|||
@Override |
|||
public OrganizationMessageResultDTO getDetail(String messageId) { |
|||
List<OrganizationMessageResultDTO> list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),null, null, null, null, null,messageId); |
|||
if(CollectionUtils.isNotEmpty(list)){ |
|||
OrganizationMessageResultDTO resultDTO=list.get(NumConstant.ZERO); |
|||
LambdaQueryWrapper<OrganizationMessagePublishRangeEntity> queryWrapper=new LambdaQueryWrapper<>(); |
|||
queryWrapper.eq(OrganizationMessagePublishRangeEntity::getMessageId,messageId) |
|||
.orderByAsc(OrganizationMessagePublishRangeEntity::getCreatedTime); |
|||
List<OrganizationMessagePublishRangeEntity> rangeList=organizationMessagePublishRangeDao.selectList(queryWrapper); |
|||
resultDTO.setRangeList(ConvertUtils.sourceToTarget(rangeList,OrganizationMessagePublishRangeDTO.class)); |
|||
return resultDTO; |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
/** |
|||
* 发布消息 |
|||
* |
|||
* @param formDTO |
|||
* @return 返回消息id |
|||
*/ |
|||
@Transactional(rollbackFor = Exception.class) |
|||
@Override |
|||
public String publish(OrganizationMessageFormDTO formDTO) { |
|||
OrganizationMessageEntity messageEntity = ConvertUtils.sourceToTarget(formDTO, OrganizationMessageEntity.class); |
|||
CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getPublishStaffId()); |
|||
messageEntity.setPublishStaffName(staffInfoCacheResult.getRealName()); |
|||
messageEntity.setPublishOrgId(staffInfoCacheResult.getAgencyId()); |
|||
messageEntity.setPublishOrgIdPath(PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds())); |
|||
messageEntity.setPublishOrgName(staffInfoCacheResult.getAgencyName()); |
|||
messageEntity.setPublishTime(new Date()); |
|||
messageEntity.setSendMsgRes("sending"); |
|||
baseDao.insert(messageEntity); |
|||
for (OrganizationMessagePublishRangeDTO dto : formDTO.getRangeList()) { |
|||
OrganizationMessagePublishRangeEntity rangeEntity = new OrganizationMessagePublishRangeEntity(); |
|||
rangeEntity.setCustomerId(messageEntity.getCustomerId()); |
|||
rangeEntity.setMessageId(messageEntity.getId()); |
|||
rangeEntity.setOrgId(dto.getOrgId()); |
|||
rangeEntity.setOrgType(dto.getOrgType()); |
|||
if (OrgTypeEnum.GRID.getCode().equals(dto.getOrgType())) { |
|||
GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getOrgId()); |
|||
rangeEntity.setPid(gridInfoCache.getPid()); |
|||
rangeEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(dto.getOrgId(), gridInfoCache.getPids())); |
|||
rangeEntity.setOrgName(gridInfoCache.getGridNamePath()); |
|||
} else { |
|||
//if (OrgTypeEnum.AGENCY.getCode().equals(dto.getOrgType()))
|
|||
AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(dto.getOrgId()); |
|||
rangeEntity.setPid(agencyInfoCache.getPid()); |
|||
rangeEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(dto.getOrgId(), agencyInfoCache.getPids())); |
|||
rangeEntity.setOrgName(agencyInfoCache.getOrganizationName()); |
|||
} |
|||
dto.setPid(rangeEntity.getPid()); |
|||
dto.setOrgIdPath(rangeEntity.getOrgIdPath()); |
|||
organizationMessagePublishRangeDao.insert(rangeEntity); |
|||
} |
|||
String messageId = messageEntity.getId(); |
|||
return messageId; |
|||
} |
|||
|
|||
|
|||
@Async |
|||
@Override |
|||
public void sendUserMsg(String messageId, String content, String publishStaffId,List<OrganizationMessagePublishRangeDTO> rangeList, String customerId) { |
|||
String result = "success"; |
|||
int totalMsg = NumConstant.ZERO; |
|||
try { |
|||
for (OrganizationMessagePublishRangeDTO rangeDto : rangeList) { |
|||
RegisterRelationPageFormDTO pageFormDTO=new RegisterRelationPageFormDTO(); |
|||
pageFormDTO.setCustomerId(customerId); |
|||
pageFormDTO.setFirstRegister(NumConstant.ONE_STR); |
|||
pageFormDTO.setPageNo(NumConstant.ONE); |
|||
pageFormDTO.setPageSize(NumConstant.TWO); |
|||
// pageFormDTO.setPageSize(NumConstant.ONE_THOUSAND);
|
|||
if (OrgTypeEnum.GRID.getCode().equals(rangeDto.getOrgType())) { |
|||
// 查询该网格下的注册居民
|
|||
pageFormDTO.setGridId(rangeDto.getOrgId()); |
|||
} else { |
|||
// 查询该组织下的注册居民
|
|||
pageFormDTO.setAgencyIdPath(rangeDto.getOrgIdPath()); |
|||
} |
|||
List<RegisterRelationDTO> list=null; |
|||
do { |
|||
Result<PageData<RegisterRelationDTO>> regRes = epmetUserOpenFeignClient.pageQueryRegisterUser(pageFormDTO); |
|||
list = regRes.getData().getList(); |
|||
for (RegisterRelationDTO regUser : list) { |
|||
LambdaQueryWrapper<UserMessageEntity> queryWrapper=new LambdaQueryWrapper(); |
|||
queryWrapper.eq(UserMessageEntity::getCustomerId,customerId) |
|||
.eq(UserMessageEntity::getTargetId,messageId) |
|||
.eq(UserMessageEntity::getUserId,regUser.getUserId()); |
|||
UserMessageEntity origin=userMessageDao.selectOne(queryWrapper); |
|||
if(null==origin){ |
|||
UserMessageEntity userMessageEntity = new UserMessageEntity(); |
|||
userMessageEntity.setCustomerId(customerId); |
|||
userMessageEntity.setGridId(regUser.getGridId()); |
|||
userMessageEntity.setUserId(regUser.getUserId()); |
|||
userMessageEntity.setApp(AppClientConstant.APP_RESI); |
|||
userMessageEntity.setTitle("您有一条社区消息！"); |
|||
userMessageEntity.setMessageContent(content); |
|||
userMessageEntity.setReadFlag(Constant.UNREAD); |
|||
userMessageEntity.setReferer(StrConstant.EPMETY_STR); |
|||
userMessageEntity.setMessageType("organization_message"); |
|||
userMessageEntity.setTargetId(messageId); |
|||
userMessageEntity.setCreatedBy(publishStaffId); |
|||
userMessageEntity.setUpdatedBy(publishStaffId); |
|||
userMessageDao.insert(userMessageEntity); |
|||
totalMsg += 1; |
|||
} |
|||
} |
|||
pageFormDTO.setPageNo(pageFormDTO.getPageNo() + NumConstant.ONE); |
|||
} while (CollectionUtils.isNotEmpty(list) && list.size() == pageFormDTO.getPageSize()); |
|||
} |
|||
} catch (Exception e) { |
|||
log.error(String.format("messageId:%s,发送消息异常:%s", messageId, ExceptionUtils.getErrorStackTrace(e))); |
|||
result = "failed"; |
|||
} finally { |
|||
LambdaUpdateWrapper<OrganizationMessageEntity> updateWrapper = new LambdaUpdateWrapper<>(); |
|||
updateWrapper.eq(OrganizationMessageEntity::getId, messageId) |
|||
.set(OrganizationMessageEntity::getSendMsgRes, result) |
|||
.set(OrganizationMessageEntity::getTotalReceiver, totalMsg) |
|||
.set(OrganizationMessageEntity::getFinishSendTime,new Date()) |
|||
.set(OrganizationMessageEntity::getUpdatedTime,new Date()); |
|||
baseDao.update(null, updateWrapper); |
|||
} |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
<?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.OrganizationMessageDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.OrganizationMessageEntity" id="organizationMessageMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="publishDitch" column="PUBLISH_DITCH"/> |
|||
<result property="content" column="CONTENT"/> |
|||
<result property="publishStaffId" column="PUBLISH_STAFF_ID"/> |
|||
<result property="publishStaffName" column="PUBLISH_STAFF_NAME"/> |
|||
<result property="publishOrgId" column="PUBLISH_ORG_ID"/> |
|||
<result property="publishOrgIdPath" column="PUBLISH_ORG_ID_PATH"/> |
|||
<result property="publishOrgName" column="PUBLISH_ORG_NAME"/> |
|||
<result property="publishTime" column="PUBLISH_TIME"/> |
|||
<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="pageList" parameterType="map" resultType="com.epmet.dto.result.OrganizationMessageResultDTO"> |
|||
select |
|||
distinct om.ID as messageId, |
|||
om.PUBLISH_DITCH as publishDitch, |
|||
om.CONTENT as content, |
|||
om.PUBLISH_TIME as publishTime, |
|||
om.PUBLISH_STAFF_ID as publishStaffId, |
|||
om.PUBLISH_ORG_ID as publishStaffName, |
|||
om.PUBLISH_ORG_ID as publishOrgId, |
|||
om.PUBLISH_ORG_ID_PATH as publishOrgIdPath, |
|||
OM.PUBLISH_ORG_NAME as publishOrgName, |
|||
om.SEND_MSG_RES as sendMsgRes, |
|||
om.TOTAL_RECEIVER as totalReceiver, |
|||
om.FINISH_SEND_TIME as finishSendTime, |
|||
GROUP_CONCAT(r.ORG_NAME) as publishRangeName |
|||
from organization_message om |
|||
left join organization_message_publish_range r |
|||
on(om.id=r.MESSAGE_ID and r.del_flag='0') |
|||
where om.DEL_FLAG='0' |
|||
and om.CUSTOMER_ID =#{customerId} |
|||
<if test='staffOrgIdPath != null and staffOrgIdPath != "" '> |
|||
and om.PUBLISH_ORG_ID_PATH like concat(#{staffOrgIdPath},'%') |
|||
</if> |
|||
<if test='publishDitch != null and publishDitch != "" '> |
|||
and om.PUBLISH_DITCH =#{publishDitch} |
|||
</if> |
|||
<if test='orgId != null and orgId != "" '> |
|||
and r.ORG_ID =#{orgId} |
|||
</if> |
|||
<if test='startDate != null and startDate != "" '> |
|||
AND DATE_FORMAT(om.PUBLISH_TIME,'%Y-%m-%d') >= #{startDate} |
|||
</if> |
|||
<if test='endDate != null and endDate != "" '> |
|||
AND DATE_FORMAT(om.PUBLISH_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate} |
|||
</if> |
|||
<if test='messageId != null and messageId != "" '> |
|||
and om.id =#{messageId} |
|||
</if> |
|||
group by om.id |
|||
order by om.PUBLISH_TIME desc |
|||
</select> |
|||
</mapper> |
|||
@ -0,0 +1,24 @@ |
|||
<?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.OrganizationMessagePublishRangeDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.OrganizationMessagePublishRangeEntity" id="organizationMessagePublishRangeMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="messageId" column="MESSAGE_ID"/> |
|||
<result property="orgId" column="ORG_ID"/> |
|||
<result property="orgType" column="ORG_TYPE"/> |
|||
<result property="pid" column="PID"/> |
|||
<result property="orgIdPath" column="ORG_ID_PATH"/> |
|||
<result property="orgName" column="ORG_NAME"/> |
|||
<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> |
|||
|
|||
|
|||
</mapper> |
|||
@ -0,0 +1,112 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
@Data |
|||
public class ThirdAppManageDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 应用名称 |
|||
*/ |
|||
@NotBlank(message = "应用名称不能为空") |
|||
private String name; |
|||
|
|||
/** |
|||
* 应用链接 |
|||
*/ |
|||
@NotBlank(message = "应用链接不能为空") |
|||
private String link; |
|||
|
|||
/** |
|||
* 账号 |
|||
*/ |
|||
@NotBlank(message = "测试账号不能为空") |
|||
private String account; |
|||
|
|||
/** |
|||
* 密码 |
|||
*/ |
|||
@NotBlank(message = "测试密码不能为空") |
|||
private String password; |
|||
|
|||
/** |
|||
* 应用介绍 |
|||
*/ |
|||
private String remark; |
|||
|
|||
/** |
|||
* 第三方公司名 |
|||
*/ |
|||
private String companyName; |
|||
|
|||
/** |
|||
* 联系人 |
|||
*/ |
|||
@NotBlank(message = "联系人不能为空") |
|||
private String contacts; |
|||
|
|||
/** |
|||
* 联系电话 |
|||
*/ |
|||
@NotBlank(message = "联系电话不能为空") |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】 |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 删除标识 0：未删除 1：删除 |
|||
*/ |
|||
private Integer delFlag; |
|||
|
|||
/** |
|||
* 创建者 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新者 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
@Data |
|||
public class ThirdAppManageFormDTO extends PageFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
private String id; |
|||
|
|||
|
|||
/** |
|||
* 应用名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 第三方公司名 |
|||
*/ |
|||
private String companyName; |
|||
|
|||
/** |
|||
* 联系人 |
|||
*/ |
|||
private String contacts; |
|||
|
|||
/** |
|||
* 联系电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】 |
|||
*/ |
|||
private String status; |
|||
} |
|||
@ -0,0 +1,83 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.aop.NoRepeatSubmit; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.commons.tools.validator.group.AddGroup; |
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import com.epmet.commons.tools.validator.group.UpdateGroup; |
|||
import com.epmet.dto.ThirdAppManageDTO; |
|||
import com.epmet.dto.form.ThirdAppManageFormDTO; |
|||
import com.epmet.service.ThirdAppManageService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("thirdAppManage") |
|||
public class ThirdAppManageController { |
|||
|
|||
@Autowired |
|||
private ThirdAppManageService thirdAppManageService; |
|||
|
|||
@PostMapping("page") |
|||
public Result<PageData<ThirdAppManageDTO>> page(@RequestBody ThirdAppManageFormDTO formDTO){ |
|||
PageData<ThirdAppManageDTO> page = thirdAppManageService.page(formDTO); |
|||
return new Result<PageData<ThirdAppManageDTO>>().ok(page); |
|||
} |
|||
|
|||
@PostMapping("detail/{id}") |
|||
public Result<ThirdAppManageDTO> get(@PathVariable("id") String id){ |
|||
ThirdAppManageDTO data = thirdAppManageService.get(id); |
|||
return new Result<ThirdAppManageDTO>().ok(data); |
|||
} |
|||
|
|||
@NoRepeatSubmit |
|||
@PostMapping("save") |
|||
public Result save(@RequestBody ThirdAppManageDTO dto){ |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
thirdAppManageService.save(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 审核 |
|||
* |
|||
* @Param dto |
|||
* @Return {@link Result} |
|||
* @Author zhaoqifeng |
|||
* @Date 2023/2/3 14:18 |
|||
*/ |
|||
@NoRepeatSubmit |
|||
@PostMapping("audit") |
|||
public Result audit(@RequestBody ThirdAppManageDTO dto){ |
|||
//效验数据
|
|||
thirdAppManageService.audit(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 发布 |
|||
* |
|||
* @Param dto |
|||
* @Return {@link Result} |
|||
* @Author zhaoqifeng |
|||
* @Date 2023/2/3 14:18 |
|||
*/ |
|||
@NoRepeatSubmit |
|||
@PostMapping("release") |
|||
public Result release(@RequestBody ThirdAppManageDTO dto){ |
|||
//效验数据
|
|||
thirdAppManageService.release(dto); |
|||
return new Result(); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.entity.ThirdAppManageEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
@Mapper |
|||
public interface ThirdAppManageDao extends BaseDao<ThirdAppManageEntity> { |
|||
|
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
package com.epmet.entity; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("third_app_manage") |
|||
public class ThirdAppManageEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 应用名称 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 应用链接 |
|||
*/ |
|||
private String link; |
|||
|
|||
/** |
|||
* 账号 |
|||
*/ |
|||
private String account; |
|||
|
|||
/** |
|||
* 密码 |
|||
*/ |
|||
private String password; |
|||
|
|||
/** |
|||
* 应用介绍 |
|||
*/ |
|||
private String remark; |
|||
|
|||
/** |
|||
* 第三方公司名 |
|||
*/ |
|||
private String companyName; |
|||
|
|||
/** |
|||
* 联系人 |
|||
*/ |
|||
private String contacts; |
|||
|
|||
/** |
|||
* 联系电话 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】 |
|||
*/ |
|||
private String status; |
|||
|
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
package com.epmet.service; |
|||
|
|||
import com.epmet.commons.mybatis.service.BaseService; |
|||
import com.epmet.commons.tools.page.PageData; |
|||
import com.epmet.dto.ThirdAppManageDTO; |
|||
import com.epmet.dto.form.ThirdAppManageFormDTO; |
|||
import com.epmet.entity.ThirdAppManageEntity; |
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
public interface ThirdAppManageService extends BaseService<ThirdAppManageEntity> { |
|||
|
|||
/** |
|||
* 默认分页 |
|||
* |
|||
* @param formDTO |
|||
* @return PageData<ThirdAppManageDTO> |
|||
* @author generator |
|||
* @date 2023-02-03 |
|||
*/ |
|||
PageData<ThirdAppManageDTO> page(ThirdAppManageFormDTO formDTO); |
|||
|
|||
/** |
|||
* 单条查询 |
|||
* |
|||
* @param id |
|||
* @return ThirdAppManageDTO |
|||
* @author generator |
|||
* @date 2023-02-03 |
|||
*/ |
|||
ThirdAppManageDTO get(String id); |
|||
|
|||
/** |
|||
* 默认保存 |
|||
* |
|||
* @param dto |
|||
* @return void |
|||
* @author generator |
|||
* @date 2023-02-03 |
|||
*/ |
|||
void save(ThirdAppManageDTO dto); |
|||
|
|||
/** |
|||
* 审核 |
|||
* |
|||
* @Param dto |
|||
* @Return |
|||
* @Author zhaoqifeng |
|||
* @Date 2023/2/3 14:19 |
|||
*/ |
|||
void audit(ThirdAppManageDTO dto); |
|||
|
|||
/** |
|||
* 发布 |
|||
* |
|||
* @Param dto |
|||
* @Return |
|||
* @Author zhaoqifeng |
|||
* @Date 2023/2/3 14:19 |
|||
*/ |
|||
void release(ThirdAppManageDTO dto); |
|||
} |
|||
@ -0,0 +1,112 @@ |
|||
package com.epmet.service.impl; |
|||
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|||
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|||
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.page.PageData; |
|||
import com.epmet.commons.tools.utils.ConvertUtils; |
|||
import com.epmet.dao.ThirdAppManageDao; |
|||
import com.epmet.dto.ThirdAppManageDTO; |
|||
import com.epmet.dto.form.ThirdAppManageFormDTO; |
|||
import com.epmet.entity.ThirdAppManageEntity; |
|||
import com.epmet.service.ThirdAppManageService; |
|||
import com.github.pagehelper.PageInfo; |
|||
import com.github.pagehelper.page.PageMethod; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 烟台第三方应用管理 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2023-02-03 |
|||
*/ |
|||
@Service |
|||
public class ThirdAppManageServiceImpl extends BaseServiceImpl<ThirdAppManageDao, ThirdAppManageEntity> implements ThirdAppManageService { |
|||
|
|||
@Override |
|||
public PageData<ThirdAppManageDTO> page(ThirdAppManageFormDTO formDTO) { |
|||
PageMethod.startPage(formDTO.getPageNo(), formDTO.getPageSize()); |
|||
LambdaQueryWrapper<ThirdAppManageEntity> wrapper = new LambdaQueryWrapper<>(); |
|||
wrapper.like(StringUtils.isNotBlank(formDTO.getName()), ThirdAppManageEntity::getName, formDTO.getName()); |
|||
wrapper.like(StringUtils.isNotBlank(formDTO.getCompanyName()), ThirdAppManageEntity::getCompanyName, formDTO.getCompanyName()); |
|||
wrapper.like(StringUtils.isNotBlank(formDTO.getContacts()), ThirdAppManageEntity::getContacts, formDTO.getContacts()); |
|||
wrapper.like(StringUtils.isNotBlank(formDTO.getMobile()), ThirdAppManageEntity::getMobile, formDTO.getMobile()); |
|||
wrapper.eq(StringUtils.isNotBlank(formDTO.getStatus()), ThirdAppManageEntity::getStatus, formDTO.getStatus()); |
|||
wrapper.orderByDesc(ThirdAppManageEntity::getCreatedTime); |
|||
List<ThirdAppManageEntity> list = baseDao.selectList(wrapper); |
|||
PageInfo<ThirdAppManageEntity> pageInfo = new PageInfo<>(list); |
|||
return new PageData<>(ConvertUtils.sourceToTarget(list, ThirdAppManageDTO.class), pageInfo.getTotal()); |
|||
} |
|||
|
|||
@Override |
|||
public ThirdAppManageDTO get(String id) { |
|||
ThirdAppManageEntity entity = baseDao.selectById(id); |
|||
return ConvertUtils.sourceToTarget(entity, ThirdAppManageDTO.class); |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void save(ThirdAppManageDTO dto) { |
|||
ThirdAppManageEntity entity = ConvertUtils.sourceToTarget(dto, ThirdAppManageEntity.class); |
|||
insert(entity); |
|||
} |
|||
|
|||
/** |
|||
* 审核 |
|||
* |
|||
* @param dto |
|||
* @Param dto |
|||
* @Return |
|||
* @Author zhaoqifeng |
|||
* @Date 2023/2/3 14:19 |
|||
*/ |
|||
@Override |
|||
public void audit(ThirdAppManageDTO dto) { |
|||
ThirdAppManageEntity info = baseDao.selectById(dto.getId()); |
|||
if (!NumConstant.ZERO_STR.equals(info.getStatus())) { |
|||
String errorMsg = "应用已审核"; |
|||
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); |
|||
} |
|||
|
|||
ThirdAppManageEntity entity = new ThirdAppManageEntity(); |
|||
entity.setId(dto.getId()); |
|||
entity.setStatus(dto.getStatus()); |
|||
baseDao.updateById(entity); |
|||
} |
|||
|
|||
/** |
|||
* 发布 |
|||
* |
|||
* @param dto |
|||
* @Param dto |
|||
* @Return |
|||
* @Author zhaoqifeng |
|||
* @Date 2023/2/3 14:19 |
|||
*/ |
|||
@Override |
|||
public void release(ThirdAppManageDTO dto) { |
|||
ThirdAppManageEntity info = baseDao.selectById(dto.getId()); |
|||
if (NumConstant.ZERO_STR.equals(info.getStatus())) { |
|||
String errorMsg = "应用未审核，请先审核"; |
|||
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); |
|||
} else if (NumConstant.ONE_STR.equals(info.getStatus())) { |
|||
String errorMsg = "应用审核不通过，不能发布"; |
|||
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); |
|||
} else if (NumConstant.THREE_STR.equals(info.getStatus())) { |
|||
String errorMsg = "应用已发布"; |
|||
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); |
|||
} |
|||
|
|||
ThirdAppManageEntity entity = new ThirdAppManageEntity(); |
|||
entity.setId(dto.getId()); |
|||
entity.setStatus(NumConstant.THREE_STR); |
|||
baseDao.updateById(entity); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
CREATE TABLE `third_app_manage` ( |
|||
`ID` varchar(64) NOT NULL COMMENT 'id', |
|||
`CUSTOMER_ID` varchar(64) DEFAULT NULL COMMENT '客户ID', |
|||
`NAME` varchar(64) NOT NULL COMMENT '应用名称', |
|||
`LINK` varchar(128) NOT NULL COMMENT '应用链接', |
|||
`ACCOUNT` varchar(64) NOT NULL COMMENT '账号', |
|||
`PASSWORD` varchar(64) NOT NULL COMMENT '密码', |
|||
`REMARK` text COMMENT '应用介绍', |
|||
`COMPANY_NAME` varchar(64) DEFAULT '0' COMMENT '第三方公司名', |
|||
`CONTACTS` varchar(64) NOT NULL COMMENT '联系人', |
|||
`MOBILE` varchar(32) NOT NULL COMMENT '联系电话', |
|||
`STATUS` varchar(1) DEFAULT '0' COMMENT '状态【0:未审核;1:审核不通过;2:审核通过;3:已发布】', |
|||
`REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', |
|||
`DEL_FLAG` tinyint(1) unsigned DEFAULT NULL COMMENT '删除标识 0：未删除 1：删除', |
|||
`CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者', |
|||
`CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', |
|||
`UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者', |
|||
`UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', |
|||
PRIMARY KEY (`ID`) USING BTREE |
|||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='烟台第三方应用管理'; |
|||
@ -0,0 +1,27 @@ |
|||
<?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.ThirdAppManageDao"> |
|||
|
|||
<resultMap type="com.epmet.entity.ThirdAppManageEntity" id="thirdAppManageMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="name" column="NAME"/> |
|||
<result property="link" column="LINK"/> |
|||
<result property="account" column="ACCOUNT"/> |
|||
<result property="password" column="PASSWORD"/> |
|||
<result property="remark" column="REMARK"/> |
|||
<result property="companyName" column="COMPANY_NAME"/> |
|||
<result property="contacts" column="CONTACTS"/> |
|||
<result property="mobile" column="MOBILE"/> |
|||
<result property="status" column="STATUS"/> |
|||
<result property="revision" column="REVISION"/> |
|||
<result property="delFlag" column="DEL_FLAG"/> |
|||
<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> |
|||
|
|||
|
|||
</mapper> |
|||
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @ClassName AgencyCountCensus$ |
|||
* @Description |
|||
* @Date 2023/4/6 16:46 |
|||
* @Author lichao |
|||
**/ |
|||
@Data |
|||
public class CommunityCountCensusFormDTO implements Serializable { |
|||
|
|||
|
|||
|
|||
private static final long serialVersionUID = 4360690752084258055L; |
|||
|
|||
@NotBlank(message = "组织Id不能为空") |
|||
private String agencyId; |
|||
|
|||
private Date timeStart; |
|||
|
|||
private Date timeEnd; |
|||
|
|||
private Integer pageNum; |
|||
|
|||
private Integer pageSize; |
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author yzm |
|||
* @Date 2023/3/2 17:35 |
|||
*/ |
|||
@Data |
|||
public class GroupRentHouseFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -953729855530434972L; |
|||
/** |
|||
* 组织ID |
|||
*/ |
|||
private String orgId; |
|||
private String orgType; |
|||
|
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
private String ownerName; |
|||
/** |
|||
* 房主电话 |
|||
*/ |
|||
private String ownerPhone; |
|||
|
|||
/** |
|||
* 房屋用途 |
|||
*/ |
|||
private String purpose; |
|||
|
|||
/** |
|||
* 备注 |
|||
*/ |
|||
private String remark; |
|||
|
|||
|
|||
/** |
|||
* tokenDto获取 |
|||
*/ |
|||
private String customerId; |
|||
private String staffId; |
|||
} |
|||
|
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @Description 根据小区，楼宇，单元名称校验是否存在 |
|||
* @Author wgf |
|||
* @Date 2022/8/24 9:03 |
|||
*/ |
|||
@Data |
|||
public class HouseCountPictureFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 2636608477324780974L; |
|||
|
|||
private String orgIdPath; |
|||
|
|||
private String orgId; |
|||
|
|||
private String orgType; |
|||
|
|||
private Date timeStart; |
|||
|
|||
private Date timeEnd; |
|||
|
|||
private String purpose; |
|||
|
|||
private Integer rentFlag; |
|||
|
|||
private Integer pageSize; |
|||
|
|||
private Integer pageNo; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet.dto.form.lingshan; |
|||
|
|||
import com.epmet.commons.tools.validator.group.QueryGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Description 灵山大屏，根据网格id，查询党员中心户房屋坐标 |
|||
* @Author yzm |
|||
* @Date 2023/5/18 10:14 |
|||
*/ |
|||
@Data |
|||
public class ScreenPartyCenterHouseDistributionFormDTO { |
|||
/** |
|||
* 网格必填 |
|||
*/ |
|||
@NotBlank(message = "gridId不能为空",groups = QueryGroup.class) |
|||
private String gridId; |
|||
private String neighborHoodId; |
|||
private String buildingId; |
|||
} |
|||
|
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue