jianjun
4 years ago
56 changed files with 1490 additions and 128 deletions
@ -0,0 +1,28 @@ |
|||
package com.epmet.commons.tools.dto.form; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* desc:查询巡查 参数 |
|||
* |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2021/6/7 16:23 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class MidBaseFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 7585836892408288392L; |
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
/** |
|||
* 对象id 没有则查询全部 |
|||
*/ |
|||
private String objectId; |
|||
|
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 当前用户与需求消息的关系 |
|||
*/ |
|||
@Data |
|||
public class UserDemandRelFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 948510931204329428L; |
|||
|
|||
public interface AddInternalGroup { |
|||
} |
|||
@NotBlank(message = "需求id不能为空",groups = AddInternalGroup.class) |
|||
private String demandRecId; |
|||
|
|||
@NotBlank(message = "userId不能为空",groups = AddInternalGroup.class) |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,18 @@ |
|||
package com.epmet.dto.result.demand; |
|||
|
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 当前用户与需求消息的关系 |
|||
*/ |
|||
@AllArgsConstructor |
|||
@Data |
|||
public class UserDemandRelResDTO implements Serializable { |
|||
private static final long serialVersionUID = -9007483306143283653L; |
|||
// 需求发布人：publisher ；服务人：server
|
|||
private String identity; |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.mq; |
|||
|
|||
import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; |
|||
import com.epmet.commons.rocketmq.constants.TopicConstants; |
|||
import com.epmet.commons.rocketmq.register.MQAbstractRegister; |
|||
import com.epmet.commons.rocketmq.register.MQConsumerProperties; |
|||
import com.epmet.mq.listener.PointListener; |
|||
import com.epmet.service.UserPointActionLogService; |
|||
import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
public class RocketMQConsumerRegister extends MQAbstractRegister { |
|||
|
|||
@Autowired |
|||
private UserPointActionLogService userPointActionLogService; |
|||
|
|||
@Override |
|||
public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { |
|||
// 客户初始化监听器注册
|
|||
register(consumerProperties, ConsomerGroupConstants.RESI_GROUP_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.RESI_GROUP, "*", new PointListener(userPointActionLogService)); |
|||
register(consumerProperties, ConsomerGroupConstants.EPMET_HEART_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.EPMET_HEART, "*", new PointListener(userPointActionLogService)); |
|||
|
|||
// ...其他监听器类似
|
|||
} |
|||
} |
|||
@ -0,0 +1,236 @@ |
|||
package com.epmet.mq.listener; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.rocketmq.constants.MQUserPropertys; |
|||
import com.epmet.commons.rocketmq.messages.LoginMQMsg; |
|||
import com.epmet.commons.tools.distributedlock.DistributedLock; |
|||
import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; |
|||
import com.epmet.commons.tools.enums.EventEnum; |
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.commons.tools.exception.RenException; |
|||
import com.epmet.commons.tools.redis.RedisKeys; |
|||
import com.epmet.commons.tools.redis.RedisUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.utils.SpringContextUtils; |
|||
import com.epmet.constant.SystemMessageType; |
|||
import com.epmet.service.UserPointActionLogService; |
|||
import dto.form.SendPointFormDTO; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; |
|||
import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; |
|||
import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; |
|||
import org.apache.rocketmq.common.message.MessageExt; |
|||
import org.redisson.api.RLock; |
|||
import org.slf4j.Logger; |
|||
import org.slf4j.LoggerFactory; |
|||
|
|||
import java.util.List; |
|||
import java.util.concurrent.TimeUnit; |
|||
|
|||
/** |
|||
* @author wxz |
|||
* @Description 登录操作日志监听器 |
|||
|
|||
* @return |
|||
* @date 2021.06.07 16:12 |
|||
*/ |
|||
@Slf4j |
|||
public class PointListener implements MessageListenerConcurrently { |
|||
|
|||
private RedisUtils redisUtils; |
|||
|
|||
private UserPointActionLogService userPointActionLogService; |
|||
|
|||
public PointListener(UserPointActionLogService userPointActionLogService) { |
|||
this.userPointActionLogService = userPointActionLogService; |
|||
} |
|||
|
|||
@Override |
|||
public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) { |
|||
|
|||
if (redisUtils == null) { |
|||
redisUtils = SpringContextUtils.getBean(RedisUtils.class); |
|||
} |
|||
|
|||
try { |
|||
msgs.forEach(msg -> consumeMessage(msg)); |
|||
} catch (Exception e) { |
|||
log.error(ExceptionUtils.getErrorStackTrace(e)); |
|||
return ConsumeConcurrentlyStatus.RECONSUME_LATER; |
|||
} |
|||
return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; |
|||
} |
|||
|
|||
private void consumeMessage(MessageExt messageExt) { |
|||
String tags = messageExt.getTags(); |
|||
String msg = new String(messageExt.getBody()); |
|||
String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); |
|||
log.info("【积分操作监听器】-收到消息内容:{}", msg); |
|||
|
|||
DistributedLock distributedLock = null; |
|||
RLock lock = null; |
|||
try { |
|||
distributedLock = SpringContextUtils.getBean(DistributedLock.class); |
|||
lock = distributedLock.getLock("lock:point_operation", 30L, 30L, TimeUnit.SECONDS); |
|||
|
|||
switch (tags) { |
|||
case SystemMessageType.PARTICIPATE_ONE_TOPIC: |
|||
resiGroupPointOpe(msg); |
|||
break; |
|||
case SystemMessageType.ACTIVE_SEND_POINT: |
|||
// 爱心活动积分发放
|
|||
activeSendPoint(msg); |
|||
break; |
|||
case SystemMessageType.ACTIVE_INSERT_LIVE: |
|||
// 添加活动实况
|
|||
activeInsertLive(msg); |
|||
break; |
|||
case SystemMessageType.REGISTER_VOLUNTEER: |
|||
// 注册志愿者
|
|||
registerVolunteer(msg); |
|||
break; |
|||
case SystemMessageType.TOPIC_TO_ISSUE: |
|||
// 话题被组长转为议题
|
|||
topicToIssue(msg); |
|||
break; |
|||
case SystemMessageType.TOPIC_TO_PROJECT: |
|||
// 话题转为项目
|
|||
topicToProject(msg); |
|||
break; |
|||
case SystemMessageType.INVITE_RESI_INTO_GROUP: |
|||
inviteResiIntoGroup(msg); |
|||
break; |
|||
case SystemMessageType.INVITE_NEW_INTO_GROUP: |
|||
inviteNewIntoGroup(msg); |
|||
break; |
|||
case SystemMessageType.SHIFT_TOPIC_TO_ISSUE: |
|||
shiftTopicToIssue(msg); |
|||
break; |
|||
case SystemMessageType.PUBLISH_ONE_TOPIC: |
|||
publicOneTopic(msg); |
|||
break; |
|||
case SystemMessageType.LEADER_RESOLVE_TOPIC: |
|||
leaderResolveTopic(msg); |
|||
break; |
|||
} |
|||
|
|||
} catch (RenException e) { |
|||
// 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
|
|||
log.error("【积分操作监听器】消费消息失败:".concat(ExceptionUtils.getErrorStackTrace(e))); |
|||
} catch (Exception e) { |
|||
// 不是我们自己抛出的异常，可以让MQ重试
|
|||
log.error("【积分操作监听器】消费消息失败:".concat(ExceptionUtils.getErrorStackTrace(e))); |
|||
throw e; |
|||
} finally { |
|||
distributedLock.unLock(lock); |
|||
} |
|||
|
|||
if (StringUtils.isNotBlank(pendingMsgLabel)) { |
|||
try { |
|||
removePendingMqMsgCache(pendingMsgLabel); |
|||
} catch (Exception e) { |
|||
log.error("【登录操作事件监听器】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); |
|||
} |
|||
} |
|||
} |
|||
|
|||
private void leaderResolveTopic(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void publicOneTopic(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void shiftTopicToIssue(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void inviteNewIntoGroup(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void inviteResiIntoGroup(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void topicToProject(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void topicToIssue(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(), obj); |
|||
}); |
|||
} |
|||
|
|||
private void registerVolunteer(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(EventEnum.REGISTER_VOLUNTEER.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
private void activeInsertLive(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(), obj); |
|||
}); |
|||
} |
|||
|
|||
private void activeSendPoint(String msg) { |
|||
List<SendPointFormDTO> formDTO = JSON.parseArray(msg, SendPointFormDTO.class); |
|||
userPointActionLogService.grantPoint(formDTO); |
|||
} |
|||
|
|||
private void resiGroupPointOpe(String msg) { |
|||
List<BasePointEventMsg> formList = JSON.parseArray(msg, BasePointEventMsg.class); |
|||
|
|||
formList.forEach(obj -> { |
|||
userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); |
|||
}); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* @description |
|||
* |
|||
* @param pendingMsgLabel |
|||
* @return |
|||
* @author wxz |
|||
* @date 2021.10.14 16:32:32 |
|||
*/ |
|||
private void removePendingMqMsgCache(String pendingMsgLabel) { |
|||
String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); |
|||
redisUtils.delete(key); |
|||
//logger.info("【登录操作事件监听器】删除pendingMsgLabel成功:{}", pendingMsgLabel);
|
|||
} |
|||
} |
|||
@ -0,0 +1,58 @@ |
|||
/** |
|||
* 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.opendata.controller; |
|||
|
|||
|
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.commons.tools.validator.group.DefaultGroup; |
|||
import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; |
|||
import com.epmet.opendata.service.BaseGridDailyworkService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
|
|||
/** |
|||
* 巡查例行工作 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-12-24 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("basegriddailywork") |
|||
public class BaseGridDailyworkController { |
|||
|
|||
@Autowired |
|||
private BaseGridDailyworkService baseGridDailyworkService; |
|||
|
|||
/** |
|||
* @Author sun |
|||
* @Description 巡查信息中间库同步 分页 |
|||
**/ |
|||
@PostMapping("sync") |
|||
public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, DefaultGroup.class); |
|||
baseGridDailyworkService.insertPatrolRecord(formDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
/** |
|||
* 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.opendata.dao; |
|||
|
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.opendata.entity.BaseGridDailyworkEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
/** |
|||
* 巡查例行工作 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-12-24 |
|||
*/ |
|||
@Mapper |
|||
public interface BaseGridDailyworkDao extends BaseDao<BaseGridDailyworkEntity> { |
|||
|
|||
} |
|||
@ -0,0 +1,155 @@ |
|||
/** |
|||
* 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.opendata.entity; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableLogic; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 巡查例行工作 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-12-24 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("base_grid_dailywork") |
|||
public class BaseGridDailyworkEntity implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
private String id; |
|||
|
|||
/** |
|||
* 客户Id customer.id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格ID |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 网格名称 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
/** |
|||
* 一级工作类型 |
|||
*/ |
|||
private String firstWorkType; |
|||
|
|||
/** |
|||
* 二级工作类型 |
|||
*/ |
|||
private String secondWorkType; |
|||
|
|||
/** |
|||
* 事项名称 |
|||
*/ |
|||
private String eventName; |
|||
|
|||
/** |
|||
* 发生日期 格式为“YYYY-MM-DD” |
|||
*/ |
|||
private String happenTime; |
|||
|
|||
/** |
|||
* 有无变动（异常）Y：是、N：否 |
|||
*/ |
|||
private String workResult; |
|||
|
|||
/** |
|||
* 工作内容 |
|||
*/ |
|||
private String workContent; |
|||
|
|||
/** |
|||
* 重点场所类别 字典值 |
|||
*/ |
|||
private String keyAreaType; |
|||
|
|||
/** |
|||
* 宗教活动规模 字典值 |
|||
*/ |
|||
private String regionScale; |
|||
|
|||
/** |
|||
* 重点场所是否发生变动 Y;N |
|||
*/ |
|||
private String isKeyareaState; |
|||
|
|||
/** |
|||
* 重点人员是否在当地-当事件类型为【特殊人群服务与管理】时必填 |
|||
*/ |
|||
private String isKeyPeopleLocate; |
|||
|
|||
/** |
|||
* 重点人员现状 |
|||
*/ |
|||
private String keyPeopleStatus; |
|||
|
|||
/** |
|||
* 发生地 |
|||
*/ |
|||
private String happenPlace; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String lng; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String lat; |
|||
|
|||
/** |
|||
* 抽取状态：0是未抽取，1代表已抽取，2是抽取失败 |
|||
*/ |
|||
//private String flag;
|
|||
@TableLogic |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updateBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updateTime; |
|||
|
|||
} |
|||
@ -0,0 +1,46 @@ |
|||
/** |
|||
* 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.opendata.service; |
|||
|
|||
import com.epmet.commons.mybatis.service.BaseService; |
|||
import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; |
|||
import com.epmet.opendata.entity.BaseGridDailyworkEntity; |
|||
|
|||
/** |
|||
* 用户巡查主记录 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-10-14 |
|||
*/ |
|||
public interface BaseGridDailyworkService extends BaseService<BaseGridDailyworkEntity> { |
|||
|
|||
/** |
|||
* desc：根据条件插入巡查记录 |
|||
* @param patrolRecordForm |
|||
* @return |
|||
*/ |
|||
Boolean insertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm); |
|||
|
|||
/** |
|||
* desc：重新加载数据 |
|||
* @param customerId |
|||
* @return |
|||
*/ |
|||
Boolean reloadPatrolData(String customerId); |
|||
|
|||
} |
|||
@ -0,0 +1,180 @@ |
|||
/** |
|||
* 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.opendata.service.impl; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|||
import com.epmet.commons.tools.constant.NumConstant; |
|||
import com.epmet.commons.tools.constant.StrConstant; |
|||
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.dto.form.patrol.PatrolQueryFormDTO; |
|||
import com.epmet.dto.result.PatrolRoutineWorkResult; |
|||
import com.epmet.feign.EpmetUserOpenFeignClient; |
|||
import com.epmet.opendata.dao.BaseGridDailyworkDao; |
|||
import com.epmet.opendata.dto.ExDeptDTO; |
|||
import com.epmet.opendata.dto.ExUserDTO; |
|||
import com.epmet.opendata.dto.form.UpsertPatrolRecordForm; |
|||
import com.epmet.opendata.entity.BaseGridDailyworkEntity; |
|||
import com.epmet.opendata.service.BaseGridDailyworkService; |
|||
import com.epmet.opendata.service.ExDeptService; |
|||
import com.epmet.opendata.service.ExUserService; |
|||
import com.epmet.opendata.service.UserPatrolDetailService; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.jetbrains.annotations.NotNull; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.util.CollectionUtils; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
|
|||
/** |
|||
* 用户例行工作主记录 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-10-14 |
|||
*/ |
|||
@Slf4j |
|||
@Service |
|||
public class BaseGridDailyworkServiceImpl extends BaseServiceImpl<BaseGridDailyworkDao, BaseGridDailyworkEntity> implements BaseGridDailyworkService { |
|||
|
|||
@Autowired |
|||
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|||
@Autowired |
|||
private UserPatrolDetailService userPatrolDetailService; |
|||
@Autowired |
|||
private ExDeptService exDeptService; |
|||
@Autowired |
|||
private ExUserService exUserService; |
|||
|
|||
@Override |
|||
public Boolean insertPatrolRecord(UpsertPatrolRecordForm patrolRecordForm) { |
|||
log.info("upsertPatrolRecord param:{}", JSON.toJSONString(patrolRecordForm)); |
|||
ValidatorUtils.validateEntity(patrolRecordForm, AddGroup.class); |
|||
PatrolQueryFormDTO midPatrolFormDTO = buildParam(patrolRecordForm); |
|||
Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkList(midPatrolFormDTO); |
|||
if (record == null || !record.success()) { |
|||
log.error("获取例行工作记录失败，param:{}", JSON.toJSONString(midPatrolFormDTO)); |
|||
return false; |
|||
} |
|||
Map<String, ExDeptDTO> deptMap = exDeptService.getDeptDTOMap(patrolRecordForm.getCustomerId()); |
|||
Map<String, ExUserDTO> userMap = exUserService.getUserDTOMap(patrolRecordForm.getCustomerId()); |
|||
List<PatrolRoutineWorkResult> data = record.getData(); |
|||
if (CollectionUtils.isEmpty(data)) { |
|||
//数据已被删除了
|
|||
//暂时设置error 用于排错
|
|||
log.error("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO)); |
|||
int effectRow = baseDao.deleteById(patrolRecordForm.getId()); |
|||
log.warn("del effectRow:{}", effectRow); |
|||
return true; |
|||
} |
|||
insertRecordBatch(data, deptMap, userMap); |
|||
return true; |
|||
} |
|||
|
|||
@Override |
|||
public Boolean reloadPatrolData(String customerId) { |
|||
int pageNo = NumConstant.ONE; |
|||
int pageSize = NumConstant.ONE_THOUSAND; |
|||
List<PatrolRoutineWorkResult> resultList = null; |
|||
Map<String, ExDeptDTO> deptMap = exDeptService.getDeptDTOMap(customerId); |
|||
Map<String, ExUserDTO> userMap = exUserService.getUserDTOMap(customerId); |
|||
do { |
|||
PatrolQueryFormDTO param = new PatrolQueryFormDTO(); |
|||
param.setCustomerId(customerId); |
|||
param.setPageNo(pageNo++); |
|||
param.setPageSize(pageSize); |
|||
Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkList(param); |
|||
if (record == null || !record.success()) { |
|||
log.error("获取例行工作记录失败，param:{}", JSON.toJSONString(param)); |
|||
return false; |
|||
} |
|||
resultList = record.getData(); |
|||
if (CollectionUtils.isEmpty(resultList)){ |
|||
log.warn("不存在例行工作记录，param:{}", JSON.toJSONString(param)); |
|||
return false; |
|||
} |
|||
insertRecordBatch(resultList, deptMap, userMap); |
|||
}while (!CollectionUtils.isEmpty(resultList) && resultList.size()> pageSize ); |
|||
|
|||
return null; |
|||
} |
|||
private Boolean insertRecordBatch(List<PatrolRoutineWorkResult> list, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap){ |
|||
List<BaseGridDailyworkEntity> insertList = new ArrayList<>(); |
|||
list.forEach(o-> insertList.add(buildEntity(o, deptMap, userMap))); |
|||
//insert
|
|||
if (CollectionUtils.isEmpty(insertList)){ |
|||
log.error("构建要插入的数据为空，param:{}", JSON.toJSONString(list)); |
|||
return false; |
|||
} |
|||
this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED); |
|||
|
|||
return true; |
|||
} |
|||
|
|||
|
|||
private BaseGridDailyworkEntity buildEntity(PatrolRoutineWorkResult record, Map<String, ExDeptDTO> deptMap, Map<String, ExUserDTO> userMap) { |
|||
BaseGridDailyworkEntity entity = new BaseGridDailyworkEntity(); |
|||
entity.setCustomerId(record.getCustomerId()); |
|||
|
|||
ExDeptDTO exDeptDTO = deptMap.getOrDefault(record.getGridId(),new ExDeptDTO()); |
|||
entity.setGridId(exDeptDTO.getDeptId() == null ? "":exDeptDTO.getDeptId().toString()); |
|||
entity.setGridName(exDeptDTO.getDeptName()); |
|||
|
|||
|
|||
entity.setFirstWorkType(record.getWorkTypeFirstCode()); |
|||
entity.setSecondWorkType(record.getWorkTypeSecondCode()); |
|||
entity.setEventName(record.getTitle()); |
|||
entity.setHappenTime(record.getHappenTime()); |
|||
entity.setWorkResult(NumConstant.ONE == record.getIsNormal()? "Y":"N"); |
|||
entity.setWorkContent(record.getWorkContent()); |
|||
//业务暂时不支持
|
|||
entity.setKeyAreaType(StrConstant.EPMETY_STR); |
|||
entity.setRegionScale(StrConstant.EPMETY_STR); |
|||
entity.setIsKeyareaState(StrConstant.EPMETY_STR); |
|||
entity.setIsKeyPeopleLocate(NumConstant.ONE == record.getIsKeyPeopleLocate()?"Y":"N"); |
|||
entity.setKeyPeopleStatus(record.getKeyPeopleStatus()); |
|||
entity.setHappenPlace(record.getAddress()); |
|||
entity.setLng(record.getLongitude()); |
|||
entity.setLat(record.getLatitude()); |
|||
//entity.setFlag(NumConstant.ZERO_STR);
|
|||
Integer userId = userMap.getOrDefault(record.getCreatedBy(), new ExUserDTO()).getUserId(); |
|||
entity.setCreateBy(userId == null?record.getCreatedBy():userId.toString()); |
|||
entity.setCreateTime(record.getCreatedTime()); |
|||
Integer userIdU = userMap.getOrDefault(record.getUpdatedBy(), new ExUserDTO()).getUserId(); |
|||
entity.setUpdateBy(userIdU == null? record.getCreatedBy():userIdU.toString()); |
|||
entity.setUpdateTime(record.getUpdatedTime()); |
|||
entity.setId(record.getId()+"_PY"); |
|||
entity.setDelFlag(NumConstant.ZERO_STR); |
|||
return entity; |
|||
} |
|||
|
|||
@NotNull |
|||
private PatrolQueryFormDTO buildParam(UpsertPatrolRecordForm patrolRecordForm) { |
|||
PatrolQueryFormDTO midPatrolFormDTO = new PatrolQueryFormDTO(); |
|||
midPatrolFormDTO.setCustomerId(patrolRecordForm.getCustomerId()); |
|||
midPatrolFormDTO.setId(patrolRecordForm.getId()); |
|||
midPatrolFormDTO.setPageNo(patrolRecordForm.getPageNo()); |
|||
midPatrolFormDTO.setPageSize(patrolRecordForm.getPageSize()); |
|||
return midPatrolFormDTO; |
|||
} |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
<?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.opendata.dao.BaseGridDailyworkDao"> |
|||
|
|||
<resultMap type="com.epmet.opendata.entity.BaseGridDailyworkEntity" id="patrolRoutineWorkMap"> |
|||
<result property="id" column="ID"/> |
|||
<result property="customerId" column="CUSTOMER_ID"/> |
|||
<result property="gridId" column="GRID_ID"/> |
|||
<result property="gridName" column="GRID_NAME"/> |
|||
<result property="firstWorkType" column="FIRST_WORK_TYPE"/> |
|||
<result property="secondWorkType" column="SECOND_WORK_TYPE"/> |
|||
<result property="eventName" column="EVENT_NAME"/> |
|||
<result property="happenTime" column="HAPPEN_TIME"/> |
|||
<result property="workResult" column="WORK_RESULT"/> |
|||
<result property="workContent" column="WORK_CONTENT"/> |
|||
<result property="keyAreaType" column="KEY_AREA_TYPE"/> |
|||
<result property="regionScale" column="REGION_SCALE"/> |
|||
<result property="isKeyareaState" column="IS_KEYAREA_STATE"/> |
|||
<result property="isKeyPeopleLocate" column="IS_KEY_PEOPLE_LOCATE"/> |
|||
<result property="keyPeopleStatus" column="KEY_PEOPLE_STATUS"/> |
|||
<result property="happenPlace" column="HAPPEN_PLACE"/> |
|||
<result property="lng" column="LNG"/> |
|||
<result property="lat" column="LAT"/> |
|||
<result property="flag" column="FLAG"/> |
|||
<result property="delFlag" column="DEL_FLAG"/> |
|||
<result property="revision" column="REVISION"/> |
|||
<result property="createBy" column="CREATE_BY"/> |
|||
<result property="createTime" column="CREATE_TIME"/> |
|||
<result property="updateBy" column="UPDATE_BY"/> |
|||
<result property="updateTime" column="UPDATE_TIME"/> |
|||
</resultMap> |
|||
|
|||
|
|||
</mapper> |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.form.patrol; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* desc:查询巡查 参数 |
|||
* |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2021/6/7 16:23 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class PatrolQueryFormDTO extends PageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 7585836892408288392L; |
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
/** |
|||
* 对象id 没有则查询全部 |
|||
*/ |
|||
private String id; |
|||
|
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* desc:例行工作结果 |
|||
* |
|||
* @Author zxc |
|||
* @DateTime 2021/10/19 10:41 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PatrolRoutineWorkResult implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 6508374707998213266L; |
|||
private String id; |
|||
|
|||
private String customerId; |
|||
|
|||
private String gridId; |
|||
|
|||
private String title; |
|||
|
|||
/** |
|||
* 一级工作类型 code |
|||
*/ |
|||
private String workTypeFirstCode; |
|||
|
|||
/** |
|||
* 二级工作类型 code |
|||
*/ |
|||
private String workTypeSecondCode; |
|||
|
|||
private Integer isNormal; |
|||
|
|||
private String happenTime; |
|||
|
|||
private String workContent; |
|||
|
|||
private String address; |
|||
|
|||
/** |
|||
* 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地 |
|||
*/ |
|||
private Integer isKeyPeopleLocate; |
|||
/** |
|||
* 当事件类型为【特殊人群服务与管理】时必填 重点人员现状 |
|||
*/ |
|||
private String keyPeopleStatus; |
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
private Integer revision; |
|||
|
|||
|
|||
private String createdBy; |
|||
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date createdTime; |
|||
|
|||
|
|||
private String updatedBy; |
|||
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date updatedTime; |
|||
|
|||
|
|||
} |
|||
Loading…
Reference in new issue