Skip to content

C
complex-platform
Commit 2f585aab authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

修改综窗事项列表接口

parent 831ea89f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2712 additions and 1834 deletions
common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java
View file @ 2f585aab
package com.mortals.xhx.system; //package com.mortals.xhx.system;
//
import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
import com.mortals.framework.model.AccessLogPdu; //import com.mortals.framework.model.AccessLogPdu;
import com.mortals.framework.model.BizLogPdu; //import com.mortals.framework.model.BizLogPdu;
import com.mortals.framework.model.ErrorLogPdu; //import com.mortals.framework.model.ErrorLogPdu;
import com.mortals.framework.model.OperateLogPdu; //import com.mortals.framework.model.OperateLogPdu;
import com.mortals.framework.service.IMessageProduceService; //import com.mortals.framework.service.IMessageProduceService;
import com.mortals.xhx.common.keys.QueueKey; //import com.mortals.xhx.common.keys.QueueKey;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate; //import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary; //import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
@Component ////@Component
@Primary //@Primary
@Slf4j //@Slf4j
public class MessageProducer implements IMessageProduceService { //public class MessageProducer implements IMessageProduceService {
//
@Autowired // @Autowired
private RabbitTemplate rabbitTemplate; // private RabbitTemplate rabbitTemplate;
//
public void syncAccessSend(AccessLogPdu accessLogPdu) { // public void syncAccessSend(AccessLogPdu accessLogPdu) {
//new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)) // //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
//rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))); // //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
//
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu)); // rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
//rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu); // //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
} // }
//
@Override // @Override
public void syncBizSend(BizLogPdu bizLogPdu) { // public void syncBizSend(BizLogPdu bizLogPdu) {
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu)); // rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
} // }
//
@Override // @Override
public void syncErrorSend(ErrorLogPdu errorLogPdu) { // public void syncErrorSend(ErrorLogPdu errorLogPdu) {
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu)); // rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
} // }
//
@Override // @Override
public void syncOperSend(OperateLogPdu operLogPdu) { // public void syncOperSend(OperateLogPdu operLogPdu) {
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu)); // rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
} // }
//
} //}
complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java
View file @ 2f585aab
...@@ -9,6 +9,8 @@ import com.alibaba.fastjson.TypeReference; ...@@ -9,6 +9,8 @@ import com.alibaba.fastjson.TypeReference;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.ICacheService;
import com.mortals.xhx.busiz.req.ComplexImplementationReq; import com.mortals.xhx.busiz.req.ComplexImplementationReq;
import com.mortals.xhx.busiz.req.FindHandlingPageReq; import com.mortals.xhx.busiz.req.FindHandlingPageReq;
...@@ -32,6 +34,7 @@ import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfoList; ...@@ -32,6 +34,7 @@ import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfoList;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.axis.utils.StringUtils; import org.apache.axis.utils.StringUtils;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -39,7 +42,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -39,7 +42,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.io.File; import java.io.File;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collector; import java.util.stream.Collector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -65,6 +70,7 @@ public class ComplexApiController { ...@@ -65,6 +70,7 @@ public class ComplexApiController {
@Autowired @Autowired
private ApplyMatterService applyMatterService; private ApplyMatterService applyMatterService;
/** /**
* 事项列表查询 * 事项列表查询
* *
...@@ -76,33 +82,46 @@ public class ComplexApiController { ...@@ -76,33 +82,46 @@ public class ComplexApiController {
public String eventImplementationList(@RequestBody ComplexImplementationReq req) { public String eventImplementationList(@RequestBody ComplexImplementationReq req) {
log.info("【事项列表查询】【请求体】--> " + JSONObject.toJSONString(req)); log.info("【事项列表查询】【请求体】--> " + JSONObject.toJSONString(req));
req.setUrlPath("eventImplementation/list"); req.setUrlPath("eventImplementation/list");
ApiResp<String> rsp = new ApiResp<>(); ApiResp<Object> rsp = new ApiResp<>();
rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue()); rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
try { try {
req.setNonce(RandomUtil.randomNumbers(6)); PageInfo pageInfo = new PageInfo(req.getPageSize());
cacheService.lpush(KEY_COMPLEX_REQ, JSONObject.toJSONString(req)); pageInfo.setCurrPage(req.getCurrentPage());
String rest = cacheService.blpop(KEY_EVENT_IMPLEMENTATION_RESP + req.getNonce(), HTTP_TIMEOUT, String.class); ApplyMatterEntity query = new ApplyMatterEntity();
if (ObjectUtil.isEmpty(rest)) { BeanUtils.copyProperties(req, query);
throw new AppException("请求访问超时");
} Result<ApplyMatterEntity> result = applyMatterService.find(query,pageInfo,null);
Rest<ImplementEventInfo> eventListRest = JSON.parseObject(rest, new TypeReference<Rest<ImplementEventInfo>>() { Map<String, Object> model = new HashMap();
}); model.put("records",result.getList());
if(eventListRest.getCode()==1){ model.put("current",result.getPageInfo().getCurrPage());
Integer applyType = req.getApplyType()==null?1:req.getApplyType(); model.put("pages",result.getPageInfo().getTotalPage());
List<ApplyMatterEntity> entityList = applyMatterService.find(new ApplyMatterQuery().applyType(applyType)); model.put("size",result.getPageInfo().getPrePageResult());
if(CollectionUtils.isNotEmpty(entityList)) { model.put("total",result.getPageInfo().getTotalResult());
Set<String> matter = entityList.stream().map(t -> t.getEventId()).collect(Collectors.toSet()); rsp.setData(model);
for (RecordsItem item : eventListRest.getData().getRecords()) { // req.setNonce(RandomUtil.randomNumbers(6));
if(matter.contains(item.getEventId())){ // cacheService.lpush(KEY_COMPLEX_REQ, JSONObject.toJSONString(req));
item.setEnableFlag(1); // String rest = cacheService.blpop(KEY_EVENT_IMPLEMENTATION_RESP + req.getNonce(), HTTP_TIMEOUT, String.class);
}else { // if (ObjectUtil.isEmpty(rest)) {
item.setEnableFlag(0); // throw new AppException("请求访问超时");
} // }
} // Rest<ImplementEventInfo> eventListRest = JSON.parseObject(rest, new TypeReference<Rest<ImplementEventInfo>>() {
} // });
} // if(eventListRest.getCode()==1){
return JSON.toJSONString(eventListRest); // Integer applyType = req.getApplyType()==null?1:req.getApplyType();
// List<ApplyMatterEntity> entityList = applyMatterService.find(new ApplyMatterQuery().applyType(applyType));
// if(CollectionUtils.isNotEmpty(entityList)) {
// Set<String> matter = entityList.stream().map(t -> t.getEventId()).collect(Collectors.toSet());
// for (RecordsItem item : eventListRest.getData().getRecords()) {
// if(matter.contains(item.getEventId())){
// item.setEnableFlag(1);
// }else {
// item.setEnableFlag(0);
// }
// }
// }
// }
return JSON.toJSONString(rsp);
} catch (Exception e) { } catch (Exception e) {
log.error("接收数据失败", e); log.error("接收数据失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue()); rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
......
complex-window-manager/src/main/java/com/mortals/xhx/module/matter/model/ApplyMatterEntity.java
View file @ 2f585aab
...@@ -10,46 +10,58 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -10,46 +10,58 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.ApplyMatterVo; import com.mortals.xhx.module.matter.model.vo.ApplyMatterVo;
import lombok.Data; import lombok.Data;
/** /**
* 申报事项列表实体对象 * 申报事项列表实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-06-20 * @date 2024-07-01
*/ */
@Data @Data
public class ApplyMatterEntity extends ApplyMatterVo { public class ApplyMatterEntity extends ApplyMatterVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 可申报类型 * 可申报类型
*/ */
private Integer applyType; private Integer applyType;
/** /**
* 实施清单事项ID * 实施清单事项ID
*/ */
private String eventId; private String eventId;
/** /**
* 事项类型 * 事项类型
*/ */
private String eventType; private String eventType;
/** /**
* 实施编码 * 实施编码
*/ */
private String implementCoding; private String implementCoding;
/** /**
* 业务办理项编码 * 业务办理项编码
*/ */
private String handlingItemCode; private String handlingItemCode;
/** /**
* 实施清单名称 * 实施清单名称
*/ */
private String implementName; private String implementName;
/** /**
* 事项面向对象分类 * 事项面向对象分类
*/ */
private String eventObjectType; private String eventObjectType;
/**
* 是否纳入通办
*/
private String crossFlag;
/**
* 委托部门
*/
private Integer deptId;
/**
* 委托部门
*/
private String deptName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -57,19 +69,22 @@ public class ApplyMatterEntity extends ApplyMatterVo { ...@@ -57,19 +69,22 @@ public class ApplyMatterEntity extends ApplyMatterVo {
if (obj instanceof ApplyMatterEntity) { if (obj instanceof ApplyMatterEntity) {
ApplyMatterEntity tmp = (ApplyMatterEntity) obj; ApplyMatterEntity tmp = (ApplyMatterEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue(){
this.applyType = 0; this.applyType = 0;
this.eventId = ""; this.eventId = "";
this.eventType = ""; this.eventType = "";
this.implementCoding = ""; this.implementCoding = "";
this.handlingItemCode = ""; this.handlingItemCode = "";
this.implementName = ""; this.implementName = "";
this.eventObjectType = ""; this.eventObjectType = "";
this.crossFlag = "";
this.deptId = null;
this.deptName = "";
} }
} }
\ No newline at end of file
complex-window-manager/src/main/java/com/mortals/xhx/module/matter/model/EventImplementationEntity.java
View file @ 2f585aab
...@@ -10,42 +10,54 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -10,42 +10,54 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.EventImplementationVo; import com.mortals.xhx.module.matter.model.vo.EventImplementationVo;
import lombok.Data; import lombok.Data;
/** /**
* 综窗事项列表实体对象 * 综窗事项列表实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-06-20 * @date 2024-07-01
*/ */
@Data @Data
public class EventImplementationEntity extends EventImplementationVo { public class EventImplementationEntity extends EventImplementationVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 实施清单事项ID * 实施清单事项ID
*/ */
private String eventId; private String eventId;
/** /**
* 事项类型 * 事项类型
*/ */
private String eventType; private String eventType;
/** /**
* 实施编码 * 实施编码
*/ */
private String implementCoding; private String implementCoding;
/** /**
* 业务办理项编码 * 业务办理项编码
*/ */
private String handlingItemCode; private String handlingItemCode;
/** /**
* 实施清单名称 * 实施清单名称
*/ */
private String implementName; private String implementName;
/** /**
* 事项面向对象分类 * 事项面向对象分类
*/ */
private String eventObjectType; private String eventObjectType;
/**
* 是否纳入通办
*/
private String crossFlag;
/**
* 委托部门
*/
private Integer deptId;
/**
* 委托部门
*/
private String deptName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -53,18 +65,21 @@ public class EventImplementationEntity extends EventImplementationVo { ...@@ -53,18 +65,21 @@ public class EventImplementationEntity extends EventImplementationVo {
if (obj instanceof EventImplementationEntity) { if (obj instanceof EventImplementationEntity) {
EventImplementationEntity tmp = (EventImplementationEntity) obj; EventImplementationEntity tmp = (EventImplementationEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue(){
this.eventId = ""; this.eventId = "";
this.eventType = ""; this.eventType = "";
this.implementCoding = ""; this.implementCoding = "";
this.handlingItemCode = ""; this.handlingItemCode = "";
this.implementName = ""; this.implementName = "";
this.eventObjectType = ""; this.eventObjectType = "";
this.crossFlag = "";
this.deptId = null;
this.deptName = "";
} }
} }
\ No newline at end of file
complex-window-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/EventImplementationServiceImpl.java
View file @ 2f585aab
...@@ -20,6 +20,7 @@ import com.mortals.xhx.module.matter.model.ApplyMatterEntity; ...@@ -20,6 +20,7 @@ import com.mortals.xhx.module.matter.model.ApplyMatterEntity;
import com.mortals.xhx.module.matter.model.EventImplementationQuery; import com.mortals.xhx.module.matter.model.EventImplementationQuery;
import com.mortals.xhx.module.matter.service.ApplyMatterService; import com.mortals.xhx.module.matter.service.ApplyMatterService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
...@@ -169,12 +170,16 @@ public class EventImplementationServiceImpl extends AbstractCRUDServiceImpl<Even ...@@ -169,12 +170,16 @@ public class EventImplementationServiceImpl extends AbstractCRUDServiceImpl<Even
for (EventImplementationEntity item:list){ for (EventImplementationEntity item:list){
ApplyMatterEntity applyMatterEntity = new ApplyMatterEntity(); ApplyMatterEntity applyMatterEntity = new ApplyMatterEntity();
applyMatterEntity.initAttrValue(); applyMatterEntity.initAttrValue();
applyMatterEntity.setEventId(item.getEventId()); BeanUtils.copyProperties(item, applyMatterEntity);
applyMatterEntity.setEventObjectType(item.getEventObjectType()); // applyMatterEntity.setEventId(item.getEventId());
applyMatterEntity.setEventType(item.getEventType()); // applyMatterEntity.setEventObjectType(item.getEventObjectType());
applyMatterEntity.setHandlingItemCode(item.getHandlingItemCode()); // applyMatterEntity.setEventType(item.getEventType());
applyMatterEntity.setImplementName(item.getImplementName()); // applyMatterEntity.setHandlingItemCode(item.getHandlingItemCode());
applyMatterEntity.setImplementCoding(item.getImplementCoding()); // applyMatterEntity.setImplementName(item.getImplementName());
// applyMatterEntity.setImplementCoding(item.getImplementCoding());
// applyMatterEntity.setCrossFlag(item.getCrossFlag());
// applyMatterEntity.setDeptId(item.getDeptId());
// applyMatterEntity.setDeptName(item.getDeptName());
applyMatterEntity.setApplyType(entity.getApplyType()); applyMatterEntity.setApplyType(entity.getApplyType());
applyMatterEntity.setCreateTime(new Date()); applyMatterEntity.setCreateTime(new Date());
applyMatterEntity.setCreateUserId(userId); applyMatterEntity.setCreateUserId(userId);
...@@ -194,12 +199,16 @@ public class EventImplementationServiceImpl extends AbstractCRUDServiceImpl<Even ...@@ -194,12 +199,16 @@ public class EventImplementationServiceImpl extends AbstractCRUDServiceImpl<Even
for (RecordsItem item:records){ for (RecordsItem item:records){
EventImplementationEntity entity = new EventImplementationEntity(); EventImplementationEntity entity = new EventImplementationEntity();
entity.initAttrValue(); entity.initAttrValue();
entity.setEventId(item.getEventId()); BeanUtils.copyProperties(item, entity);
entity.setEventObjectType(item.getEventObjectType()); // entity.setEventId(item.getEventId());
entity.setEventType(item.getEventType()); // entity.setEventObjectType(item.getEventObjectType());
entity.setHandlingItemCode(item.getHandlingItemCode()); // entity.setEventType(item.getEventType());
entity.setImplementName(item.getImplementName()); // entity.setHandlingItemCode(item.getHandlingItemCode());
entity.setImplementCoding(item.getImplementCoding()); // entity.setImplementName(item.getImplementName());
// entity.setImplementCoding(item.getImplementCoding());
// entity.setCrossFlag(item.getCrossFlag());
// entity.setDeptId(item.getDeptId());
// entity.setDeptName(item.getDeptName());
list.add(entity); list.add(entity);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment