From ab43a814da847a9e533732191b4ed54c01b95d09 Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期五, 12 七月 2024 22:11:36 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/ApiLog.java | 193 +++++++++++++++++ src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 52 ++++ src/main/java/com/zy/asrs/task/AbstractHandler.java | 30 ++ src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 36 +++ src/main/java/com/zy/asrs/task/core/ReturnT.java | 65 +++++ src/main/java/com/zy/asrs/task/core/WcsDispatcher.java | 59 +++++ src/main/java/com/zy/asrs/mapper/ApiLogMapper.java | 12 + src/main/java/com/zy/asrs/service/ApiLogService.java | 10 src/main/resources/mapper/ApiLogMapper.xml | 32 ++ src/main/java/com/zy/asrs/task/core/AsrsException.java | 16 + src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 129 +++++++++++ 11 files changed, 634 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java new file mode 100644 index 0000000..45101d1 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/ApiLog.java @@ -0,0 +1,193 @@ +package com.zy.asrs.entity; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.core.common.Cools; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("man_api_log") +public class ApiLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ApiModelProperty(value= "ID") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鏃ュ織缂栧彿 + */ + @ApiModelProperty(value= "鏃ュ織缂栧彿") + private String uuid; + + /** + * 鍚嶇О绌洪棿 + */ + @ApiModelProperty(value= "鍚嶇О绌洪棿") + private String namespace; + + /** + * 鎺ュ彛鍦板潃 + */ + @ApiModelProperty(value= "鎺ュ彛鍦板潃") + private String url; + + /** + * 骞冲彴瀵嗛挜 + */ + @ApiModelProperty(value= "骞冲彴瀵嗛挜") + private String appkey; + + /** + * 鏃堕棿鎴� + */ + @ApiModelProperty(value= "鏃堕棿鎴�") + private String timestamp; + + /** + * 瀹㈡埛绔疘P + */ + @ApiModelProperty(value= "瀹㈡埛绔疘P") + @TableField("client_ip") + private String clientIp; + + /** + * 璇锋眰鍐呭 + */ + @ApiModelProperty(value= "璇锋眰鍐呭") + private String request; + + /** + * 鍝嶅簲鍐呭 + */ + @ApiModelProperty(value= "鍝嶅簲鍐呭") + private String response; + + /** + * 寮傚父鍐呭 + */ + @ApiModelProperty(value= "寮傚父鍐呭") + private String err; + + /** + * 缁撴灉 1: 鎴愬姛 0: 澶辫触 + */ + @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ") + private Integer result; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ") + private Integer status; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @TableField("create_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + public ApiLog() {} + + public ApiLog(String uuid, String namespace, String url, String appkey, String timestamp, String clientIp, String request, String response, String err, Integer result, Integer status, Date createTime, Date updateTime, String memo) { + this.uuid = uuid; + this.namespace = namespace; + this.url = url; + this.appkey = appkey; + this.timestamp = timestamp; + this.clientIp = clientIp; + this.request = request; + this.response = response; + this.err = err; + this.result = result; + this.status = status; + this.createTime = createTime; + this.updateTime = updateTime; + this.memo = memo; + } + +// ApiLog apiLog = new ApiLog( +// null, // 鏃ュ織缂栧彿 +// null, // 鍚嶇О绌洪棿 +// null, // 鎺ュ彛鍦板潃 +// null, // 骞冲彴瀵嗛挜 +// null, // 鏃堕棿鎴� +// null, // 瀹㈡埛绔疘P +// null, // 璇锋眰鍐呭 +// null, // 鍝嶅簲鍐呭 +// null, // 寮傚父鍐呭 +// null, // 缁撴灉 +// null, // 鐘舵�� +// null, // 娣诲姞鏃堕棿 +// null, // 淇敼鏃堕棿 +// null // 澶囨敞 +// ); + + public String getResult$(){ + if (null == this.result){ return null; } + switch (this.result){ + case 1: + return "鎴愬姛"; + case 0: + return "澶辫触"; + default: + return String.valueOf(this.result); + } + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + +} diff --git a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java new file mode 100644 index 0000000..8fd7687 --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.zy.asrs.entity.ApiLog; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface ApiLogMapper extends BaseMapper<ApiLog> { + int clearWeekBefore(); +} diff --git a/src/main/java/com/zy/asrs/service/ApiLogService.java b/src/main/java/com/zy/asrs/service/ApiLogService.java new file mode 100644 index 0000000..7fe969e --- /dev/null +++ b/src/main/java/com/zy/asrs/service/ApiLogService.java @@ -0,0 +1,10 @@ +package com.zy.asrs.service; + +import com.baomidou.mybatisplus.service.IService; +import com.zy.asrs.entity.ApiLog; + +public interface ApiLogService extends IService<ApiLog> { + void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success); + + boolean clearWeekBefore(); +} diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java new file mode 100644 index 0000000..37af0ef --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java @@ -0,0 +1,52 @@ +package com.zy.asrs.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.core.common.SnowflakeIdWorker; +import com.zy.asrs.entity.ApiLog; +import com.zy.asrs.mapper.ApiLogMapper; +import com.zy.asrs.service.ApiLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.Date; + +@Slf4j +@Service("apiLogService") +public class ApiLogServiceImpl extends ServiceImpl<ApiLogMapper, ApiLog> implements ApiLogService { + + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; + + @Async + @Override + public void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success) { + Date now = new Date(); + ApiLog apiLog = new ApiLog( + String.valueOf(snowflakeIdWorker.nextId()), // 鏃ュ織缂栧彿 + namespace, // 鍚嶇О绌洪棿 + url, // 鎺ュ彛鍦板潃 + appkey, // 骞冲彴瀵嗛挜 + String.valueOf(now.getTime()), // 鏃堕棿鎴� + ip, // 瀹㈡埛绔疘P + request, // 璇锋眰鍐呭 + response, + null, // 寮傚父鍐呭 + success?1:0 , // 缁撴灉 + 1, // 鐘舵�� + now, // 娣诲姞鏃堕棿 + null, // 淇敼鏃堕棿 + null // 澶囨敞 + ); + if (!this.insert(apiLog)) { + log.error("鎺ュ彛璋冪敤鏃ュ織淇濆瓨澶辫触锛�"); + } + } + + @Override + public boolean clearWeekBefore() { + return this.baseMapper.clearWeekBefore() > 0; + } + +} diff --git a/src/main/java/com/zy/asrs/task/AbstractHandler.java b/src/main/java/com/zy/asrs/task/AbstractHandler.java new file mode 100644 index 0000000..b48df43 --- /dev/null +++ b/src/main/java/com/zy/asrs/task/AbstractHandler.java @@ -0,0 +1,30 @@ +package com.zy.asrs.task; + +import com.core.exception.CoolException; +import com.zy.asrs.task.core.ReturnT; +import lombok.extern.slf4j.Slf4j; + +import java.text.MessageFormat; + +/** + * Created by vincent on 2020/7/4 + */ +@Slf4j +public abstract class AbstractHandler<T> { + + public final ReturnT<T> SUCCESS = new ReturnT<>(200, null); + public final ReturnT<T> FAIL = new ReturnT<>(500, null); + +// protected abstract ReturnT<T> start(); + + protected void exceptionHandle(String errorMsg){ + log.error(errorMsg); + exceptionHandle(errorMsg, (Object) null); + } + + protected void exceptionHandle(String errorMsg, Object... args){ + log.error(errorMsg); + throw new CoolException(MessageFormat.format(errorMsg, args)); + } + +} diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java new file mode 100644 index 0000000..fe2980f --- /dev/null +++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java @@ -0,0 +1,36 @@ +package com.zy.asrs.task; + +import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.task.handler.ReportToDismantleTheStackHandler; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * Created by Monkey D. Luffy on 2023.07.25 + * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈淇℃伅涓婁紶 + */ +@Slf4j +@Component +public class ReportToDismantleTheStackScheduler { + + @Autowired + private ReportToDismantleTheStackHandler reportToDismantleTheStackHandler; + + @Scheduled(cron = "0/3 * * * * ? ") + private void execute(){//鎷嗗灈淇℃伅涓婁紶 + int[] staNos =new int[]{118,119,120,121}; + for (int staNo : staNos){ + try{ + ReturnT<String> result = reportToDismantleTheStackHandler.start(staNo); + if (result.getCode()==200){ + break; + } + }catch (Exception e){ + log.error("绔欑偣"+staNo+"鎷嗗灈淇℃伅涓婁紶澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e); + } + } + } + +} diff --git a/src/main/java/com/zy/asrs/task/core/AsrsException.java b/src/main/java/com/zy/asrs/task/core/AsrsException.java new file mode 100644 index 0000000..7c0d744 --- /dev/null +++ b/src/main/java/com/zy/asrs/task/core/AsrsException.java @@ -0,0 +1,16 @@ +package com.zy.asrs.task.core; + +/** + * Created by vincent on 2020/7/7 + */ +public class AsrsException extends RuntimeException { + + public AsrsException(Throwable e) { + super(e); + } + + public AsrsException(String message) { + super(message); + } + +} diff --git a/src/main/java/com/zy/asrs/task/core/ReturnT.java b/src/main/java/com/zy/asrs/task/core/ReturnT.java new file mode 100644 index 0000000..26b8c12 --- /dev/null +++ b/src/main/java/com/zy/asrs/task/core/ReturnT.java @@ -0,0 +1,65 @@ +package com.zy.asrs.task.core; + +import java.io.Serializable; + +/** + * Created by vincent on 2020/7/7 + */ +public class ReturnT<T> implements Serializable { + + public static final long serialVersionUID = 42L; + public static final int SUCCESS_CODE = 200; + public static final int FAIL_CODE = 500; + private int code; + private String msg; + private T content; + + public ReturnT() { + } + + public ReturnT(int code, String msg) { + this.code = code; + this.msg = msg; + } + + public ReturnT(T content) { + this.code = 200; + this.content = content; + } + + public boolean isSuccess(){ + return this.code == 200; + } + + public int getCode() { + return this.code; + } + + public ReturnT<T> setCode(int code) { + this.code = code; + return this; + } + + public String getMsg() { + return this.msg; + } + + public ReturnT<T> setMsg(String msg) { + this.msg = msg; + return this; + } + + public T getContent() { + return this.content; + } + + public ReturnT<T> setContent(T content) { + this.content = content; + return this; + } + + public String toString() { + return "ReturnT [code=" + this.code + ", msg=" + this.msg + ", content=" + this.content + "]"; + } + +} diff --git a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java new file mode 100644 index 0000000..c916077 --- /dev/null +++ b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java @@ -0,0 +1,59 @@ +package com.zy.asrs.task.core;//package com.zy.asrs.task.core; +// +//import com.zy.asrs.task.handler.WorkLogHandler; +//import com.zy.asrs.task.handler.WorkMastHandler; +//import com.zy.system.service.ConfigService; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +// +//import javax.annotation.PostConstruct; +//import javax.annotation.PreDestroy; +// +///** +// * 鍗曠嚎绋嬫ā寮� 锛� 宸插純鐢� ) +// * 浠诲姟涓績璋冨害鍣� +// * Created by vincent on 2020/7/4 +// */ +////@Component +//@Deprecated +//public class WcsDispatcher { +// +// private static final Logger log = LoggerFactory.getLogger(WcsDispatcher.class); +// private Thread thread; +// +// @Autowired +// private WorkMastHandler workMastHandler; +// @Autowired +// private WorkLogHandler workLogHandler; +// @Autowired +// private ConfigService configService; +// +// @PostConstruct +// private void start(){ +// thread = new Thread(() -> { +// while (!Thread.currentThread().isInterrupted()) { +// try { +// Thread.sleep(3000); +// +//// workMastHandler.start(); +//// +//// workLogHandler.start(); +// +// } catch (Exception e) { +// log.error("Exception", e); +// } +// } +// }); +// thread.start(); +// log.info("浠诲姟涓績璋冨害鍣ㄥ凡鍚姩......"); +// } +// +// @PreDestroy +// public void shutDown(){ +// if (thread != null) +// thread.interrupt(); +// log.info("浠诲姟涓績璋冨害鍣ㄥ凡鍋滄......"); +// } +// +//} diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java new file mode 100644 index 0000000..844ebab --- /dev/null +++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java @@ -0,0 +1,129 @@ +package com.zy.asrs.task.handler; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.core.exception.CoolException; +import com.zy.asrs.entity.BasDevp; +import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.*; +import com.zy.asrs.task.AbstractHandler; +import com.zy.asrs.task.core.ReturnT; +import com.zy.common.utils.HttpHandler; +import com.zy.core.cache.SlaveConnection; +import com.zy.core.enums.SlaveType; +import com.zy.core.model.protocol.StaProtocol; +import com.zy.core.thread.SiemensDevpThread; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Created by Monkey D. Luffy on 2023.07.25 + * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈淇℃伅涓婁紶 + */ +@Slf4j +@Service +@Transactional +public class ReportToDismantleTheStackHandler extends AbstractHandler<String> { + + @Autowired + private WrkMastService wrkMastService; + @Autowired + private WrkDetlService wrkDetlService; + @Autowired + private StaDescService staDescService; + @Autowired + private ApiLogService apiLogService; + @Autowired + private BasDevpService basDevpService; + +// @Value("${srHangJia.url}") + private String erpUrl = "192.168.18.229:16126"; +// @Value("${srHangJia.reportOutPath}") + private String reportOutPath = "api/DepalletizingInfo/Post"; + + public ReturnT<String> start(int staNo) { + try{ + }catch (Exception e){ + log.error("寮傚父锛侊紒锛�"+e); + return FAIL; + } + return FAIL; + } + + private ReturnT<String> postMesData(String erpPath,Object combParam){ + if(combParam != null){ + String response = ""; + boolean success = false; + try { + response = new HttpHandler.Builder() + .setUri(erpUrl) + .setPath(erpPath) + .setJson(JSON.toJSONString(combParam)) + .build() + .doPost(); + JSONObject jsonObject = JSON.parseObject(response); + if (jsonObject.getInteger("Code")==200) { + success = true; + } else { + log.error("鎷嗗灈淇℃伅涓婁紶璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response); + throw new CoolException("涓婃姤erp绯荤粺澶辫触"); + } + } catch (Exception e) { + log.error("fail", e); +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return FAIL.setMsg(e.getMessage()); + } finally { + try { + // 淇濆瓨鎺ュ彛鏃ュ織 + apiLogService.save( + "涓婃姤妗佹灦绯荤粺", + erpUrl + erpPath, + null, + erpUrl, + JSON.toJSONString(combParam), + response, + success + ); + } catch (Exception e) { log.error("", e); } + } + } + return SUCCESS; + } + + public Integer getStaOther(Integer staNo){ + switch (staNo){ + case 118: + return 119; + case 119: + return 118; + case 120: + return 121; + case 121: + return 120; + default: + return 0; + } + } + + public Integer getStaEnd(Integer staNo){ + switch (staNo){ + case 118: + case 119: + return 131; + case 120: + case 121: + return 135; + default: + return 0; + } + } +} diff --git a/src/main/resources/mapper/ApiLogMapper.xml b/src/main/resources/mapper/ApiLogMapper.xml new file mode 100644 index 0000000..b6b6566 --- /dev/null +++ b/src/main/resources/mapper/ApiLogMapper.xml @@ -0,0 +1,32 @@ +<?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.zy.asrs.mapper.ApiLogMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ApiLog"> + <id column="id" property="id" /> + <result column="uuid" property="uuid" /> + <result column="namespace" property="namespace" /> + <result column="url" property="url" /> + <result column="appkey" property="appkey" /> + <result column="timestamp" property="timestamp" /> + <result column="client_ip" property="clientIp" /> + <result column="request" property="request" /> + <result column="response" property="response" /> + <result column="err" property="err" /> + <result column="result" property="result" /> + <result column="status" property="status" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="memo" property="memo" /> + + </resultMap> + + <delete id="clearWeekBefore"> + delete from man_api_log + where 1=1 + and datediff(week,create_time,getdate()) >= 1 + and result != 1 + </delete> + +</mapper> -- Gitblit v1.9.1