From b3acf754360f3ca381ae01fe9bbfb01ab129d1a9 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 29 Mar 2023 18:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=88OA=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/controller/OASendLogController.java | 15 ++++++ .../business_main/datas/entity/OASendLog.java | 47 +++++++++++++++++++ .../datas/mapper/OASendLogMapper.java | 8 ++++ .../datas/service/OASendLogService.java | 8 ++++ .../service/impl/OASendLogServiceImpl.java | 19 ++++++++ .../service/impl/WebServiceOAServiceImpl.java | 10 ++++ src/main/resources/mapper/datas/OASendLog.xml | 5 ++ 7 files changed, 112 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/OASendLogController.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OASendLog.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OASendLogMapper.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/service/OASendLogService.java create mode 100644 src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OASendLogServiceImpl.java create mode 100644 src/main/resources/mapper/datas/OASendLog.xml diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/OASendLogController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/OASendLogController.java new file mode 100644 index 00000000..1aeb1c63 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/OASendLogController.java @@ -0,0 +1,15 @@ +package com.ydw.bat.wkflow.business_main.datas.controller; + +import com.tmsps.fk.common.base.action.BaseAction; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api(description = "OA删除日志查询") +@RestController +@RequestMapping("/datas/OASendLogController") +public class OASendLogController extends BaseAction { + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OASendLog.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OASendLog.java new file mode 100644 index 00000000..44868f01 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/OASendLog.java @@ -0,0 +1,47 @@ +package com.ydw.bat.wkflow.business_main.datas.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("OA_Send_LOG") +@ApiModel(value="OASendLog对象", description="") +@Data +public class OASendLog { + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "类型") + @TableField("TYPE") + private String type; + + @ApiModelProperty(value = "日志") + @TableField("MSG_LOG") + private String msgLog; + + @ApiModelProperty(value = "方法") + @TableField("MEANS") + private String means; + + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OASendLogMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OASendLogMapper.java new file mode 100644 index 00000000..98a64d49 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/OASendLogMapper.java @@ -0,0 +1,8 @@ +package com.ydw.bat.wkflow.business_main.datas.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ydw.bat.wkflow.business_main.datas.entity.OASendLog; + +public interface OASendLogMapper extends BaseMapper { + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/OASendLogService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/OASendLogService.java new file mode 100644 index 00000000..9fba0dc1 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/OASendLogService.java @@ -0,0 +1,8 @@ +package com.ydw.bat.wkflow.business_main.datas.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ydw.bat.wkflow.business_main.datas.entity.OASendLog; + +public interface OASendLogService extends IService { + +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OASendLogServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OASendLogServiceImpl.java new file mode 100644 index 00000000..e4fa59d5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/OASendLogServiceImpl.java @@ -0,0 +1,19 @@ +package com.ydw.bat.wkflow.business_main.datas.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ydw.bat.wkflow.business_main.datas.entity.OASendLog; +import com.ydw.bat.wkflow.business_main.datas.mapper.OASendLogMapper; +import com.ydw.bat.wkflow.business_main.datas.service.OASendLogService; +import org.springframework.stereotype.Service; + +@Service +public class OASendLogServiceImpl extends ServiceImpl implements OASendLogService { + + public String addOASendLog(OASendLog oaSendLog) { + int insert = baseMapper.insert(oaSendLog); + if(insert==1){ + return "1"; + } + return null; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index a5cbff85..77763ec9 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -8,6 +8,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.*; import com.ydw.bat.wkflow.business_main.datas.mapper.SendTodoLogMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.impl.OASendLogServiceImpl; import com.ydw.bat.wkflow.business_mq.service.CreateMQService; import com.ydw.bat.wkflow.business_oa.common.WebServiceConf; import com.ydw.bat.wkflow.business_oa.utils.OkHttpUtil; @@ -72,6 +73,9 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { @Autowired private IBusProcessNameService iBusProcessNameService; + @Autowired + private OASendLogServiceImpl oaSendLogService; + public WebServiceOAServiceImpl(){ credentials = Credentials.basic(api_key,api_secret); } @@ -214,6 +218,12 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { map.put("list",notifyTodoSendContextArrayList); net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(map); log.info("调用MQ数据!!!:"+jsonObject.toString()); + OASendLog oaSendLog = new OASendLog(); + oaSendLog.setType("delete"); + oaSendLog.setCreateTime(new Date()); + oaSendLog.setMeans("deleteOAByPid"); + oaSendLog.setMsgLog(jsonObject.toString()); + oaSendLogService.addOASendLog(oaSendLog); oaService.setTodoDeleteMq(jsonObject.toString()); } } diff --git a/src/main/resources/mapper/datas/OASendLog.xml b/src/main/resources/mapper/datas/OASendLog.xml new file mode 100644 index 00000000..2641519b --- /dev/null +++ b/src/main/resources/mapper/datas/OASendLog.xml @@ -0,0 +1,5 @@ + + + + +