diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/ItemReportInterfaceLogAgainDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/ItemReportInterfaceLogAgainDTO.java new file mode 100755 index 000000000..ec5ee5a3f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/ItemReportInterfaceLogAgainDTO.java @@ -0,0 +1,106 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.interfacelog; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@Data +public class ItemReportInterfaceLogAgainDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 项目ID + */ + private String itemId; + + /** + * 项目处理流程ID + */ + private String processId; + + /** + * 调用接口名称 + */ + private String interfaceName; + + /** + * 调用接口地址 + */ + private String interfaceUrl; + + /** + * 调用是否成功 0-调用失败,1-调用成功 2-重新调用 + */ + private String successFlag; + + /** + * 调用消息体 + */ + private String callMsgBody; + + /** + * 调用返回消息体 + */ + private String returnMsgBody; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/controller/ItemReportInterfaceLogAgainController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/controller/ItemReportInterfaceLogAgainController.java new file mode 100755 index 000000000..9674bd5cc --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/controller/ItemReportInterfaceLogAgainController.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; + +import com.elink.esua.epdc.dto.interfacelog.ItemReportInterfaceLogAgainDTO; +import com.elink.esua.epdc.modules.interfacelog.excel.ItemReportInterfaceLogAgainExcel; +import com.elink.esua.epdc.modules.interfacelog.service.ItemReportInterfaceLogAgainService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@RestController +@RequestMapping("itemreportinterfacelogagain") +public class ItemReportInterfaceLogAgainController { + + @Autowired + private ItemReportInterfaceLogAgainService itemReportInterfaceLogAgainService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = itemReportInterfaceLogAgainService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + ItemReportInterfaceLogAgainDTO data = itemReportInterfaceLogAgainService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody ItemReportInterfaceLogAgainDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + itemReportInterfaceLogAgainService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody ItemReportInterfaceLogAgainDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + itemReportInterfaceLogAgainService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + itemReportInterfaceLogAgainService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = itemReportInterfaceLogAgainService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, ItemReportInterfaceLogAgainExcel.class); + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/dao/ItemReportInterfaceLogAgainDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/dao/ItemReportInterfaceLogAgainDao.java new file mode 100755 index 000000000..fa32a7dee --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/dao/ItemReportInterfaceLogAgainDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.interfacelog.entity.ItemReportInterfaceLogAgainEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@Mapper +public interface ItemReportInterfaceLogAgainDao extends BaseDao { + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/entity/ItemReportInterfaceLogAgainEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/entity/ItemReportInterfaceLogAgainEntity.java new file mode 100755 index 000000000..adec16719 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/entity/ItemReportInterfaceLogAgainEntity.java @@ -0,0 +1,76 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_item_report_interface_log_again") +public class ItemReportInterfaceLogAgainEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 项目ID + */ + private String itemId; + + /** + * 项目处理流程ID + */ + private String processId; + + /** + * 调用接口名称 + */ + private String interfaceName; + + /** + * 调用接口地址 + */ + private String interfaceUrl; + + /** + * 调用是否成功 0-调用失败,1-调用成功 2-重新调用 + */ + private String successFlag; + + /** + * 调用消息体 + */ + private String callMsgBody; + + /** + * 调用返回消息体 + */ + private String returnMsgBody; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/excel/ItemReportInterfaceLogAgainExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/excel/ItemReportInterfaceLogAgainExcel.java new file mode 100755 index 000000000..58435d26f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/excel/ItemReportInterfaceLogAgainExcel.java @@ -0,0 +1,77 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@Data +public class ItemReportInterfaceLogAgainExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "项目ID") + private String itemId; + + @Excel(name = "项目处理流程ID") + private String processId; + + @Excel(name = "调用接口名称") + private String interfaceName; + + @Excel(name = "调用接口地址") + private String interfaceUrl; + + @Excel(name = "调用是否成功 0-调用失败,1-调用成功 2-重新调用") + private String successFlag; + + @Excel(name = "调用消息体") + private String callMsgBody; + + @Excel(name = "调用返回消息体") + private String returnMsgBody; + + @Excel(name = "删除标记") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/redis/ItemReportInterfaceLogAgainRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/redis/ItemReportInterfaceLogAgainRedis.java new file mode 100755 index 000000000..eee1ffb01 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/redis/ItemReportInterfaceLogAgainRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@Component +public class ItemReportInterfaceLogAgainRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/service/ItemReportInterfaceLogAgainService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/service/ItemReportInterfaceLogAgainService.java new file mode 100755 index 000000000..76f92ae49 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/service/ItemReportInterfaceLogAgainService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.interfacelog.ItemReportInterfaceLogAgainDTO; +import com.elink.esua.epdc.modules.interfacelog.entity.ItemReportInterfaceLogAgainEntity; + +import java.util.List; +import java.util.Map; + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +public interface ItemReportInterfaceLogAgainService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-07-27 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-07-27 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return ItemReportInterfaceLogAgainDTO + * @author generator + * @date 2023-07-27 + */ + ItemReportInterfaceLogAgainDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-07-27 + */ + void save(ItemReportInterfaceLogAgainDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-07-27 + */ + void update(ItemReportInterfaceLogAgainDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-07-27 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/service/impl/ItemReportInterfaceLogAgainServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/service/impl/ItemReportInterfaceLogAgainServiceImpl.java new file mode 100755 index 000000000..2e6e86c3b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/interfacelog/service/impl/ItemReportInterfaceLogAgainServiceImpl.java @@ -0,0 +1,105 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.interfacelog.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; + +import com.elink.esua.epdc.dto.interfacelog.ItemReportInterfaceLogAgainDTO; +import com.elink.esua.epdc.modules.interfacelog.dao.ItemReportInterfaceLogAgainDao; +import com.elink.esua.epdc.modules.interfacelog.entity.ItemReportInterfaceLogAgainEntity; +import com.elink.esua.epdc.modules.interfacelog.redis.ItemReportInterfaceLogAgainRedis; +import com.elink.esua.epdc.modules.interfacelog.service.ItemReportInterfaceLogAgainService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 诉求上报接口日志表 诉求上报接口日志表 重新上报 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2023-07-27 + */ +@Service +public class ItemReportInterfaceLogAgainServiceImpl extends BaseServiceImpl implements ItemReportInterfaceLogAgainService { + + @Autowired + private ItemReportInterfaceLogAgainRedis itemReportInterfaceLogAgainRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, ItemReportInterfaceLogAgainDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, ItemReportInterfaceLogAgainDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public ItemReportInterfaceLogAgainDTO get(String id) { + ItemReportInterfaceLogAgainEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ItemReportInterfaceLogAgainDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(ItemReportInterfaceLogAgainDTO dto) { + ItemReportInterfaceLogAgainEntity entity = ConvertUtils.sourceToTarget(dto, ItemReportInterfaceLogAgainEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(ItemReportInterfaceLogAgainDTO dto) { + ItemReportInterfaceLogAgainEntity entity = ConvertUtils.sourceToTarget(dto, ItemReportInterfaceLogAgainEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 598209b61..b318fb412 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -90,8 +90,10 @@ import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.OssFeignClient; import com.elink.esua.epdc.modules.feign.UserFeignClient; +import com.elink.esua.epdc.modules.interfacelog.dao.ItemReportInterfaceLogAgainDao; import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity; import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogErrorEntity; +import com.elink.esua.epdc.modules.interfacelog.entity.ItemReportInterfaceLogAgainEntity; import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogErrorService; import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService; import com.elink.esua.epdc.modules.issue.service.IssueService; @@ -242,7 +244,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem private ItemDeptDao itemDeptDao; @Autowired private XxxdEventDao xxxdEventDao; - + @Autowired + private ItemReportInterfaceLogAgainDao itemReportInterfaceLogAgainDao; @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -5509,9 +5512,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 循环上报市平台 将状态改成3 for (ItemReportInterfaceLogEntity entity : logEntityList) { try { - cityGridApi.sendItemToCity(entity.getCallMsgBody(), entity.getInterfaceUrl(), entity.getInterfaceName()); + String result = cityGridApi.sendItemToCity(entity.getCallMsgBody(), entity.getInterfaceUrl(), entity.getInterfaceName()); entity.setSuccessFlag("2"); itemReportInterfaceLogDao.updateById(entity); + // again表再次进行记录 + ItemReportInterfaceLogAgainEntity logAgain = ConvertUtils.sourceToTarget(entity,ItemReportInterfaceLogAgainEntity.class); + if (NumConstant.ZERO_STR.equals(JSONObject.parseObject(result).get("code").toString())) { + logAgain.setSuccessFlag(NumConstant.ONE_STR); + } else { + logAgain.setSuccessFlag(NumConstant.ZERO_STR); + } + logAgain.setReturnMsgBody(result); + logAgain.setId(null); + itemReportInterfaceLogAgainDao.insert(logAgain); }catch (Exception e){ log.error("重新上报失败,id为:"+entity.getId()+",原因:"+e); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/interfacelog/ItemReportInterfaceLogAgainDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/interfacelog/ItemReportInterfaceLogAgainDao.xml new file mode 100755 index 000000000..dca8bee1b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/interfacelog/ItemReportInterfaceLogAgainDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file