From 494bee1ae257f38a025c9dd586a4a9510a536c19 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 06 八月 2024 08:06:22 +0800
Subject: [PATCH] #
---
/dev/null | 199 -------------------------------------------------
1 files changed, 0 insertions(+), 199 deletions(-)
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/config/ControllerResAdvice.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/config/ControllerResAdvice.java
deleted file mode 100644
index a2a6e28..0000000
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/config/ControllerResAdvice.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.zy.asrs.openapi.config;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.asrs.common.openapi.service.ApiLogService;
-import com.zy.asrs.common.utils.IpTools;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.http.server.ServletServerHttpRequest;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 杩斿洖鍊煎鐞�
- */
-@Slf4j
-@ControllerAdvice
-public class ControllerResAdvice implements ResponseBodyAdvice<Object> {
-
- @Autowired
- private ApiLogService apiLogService;
-
- @Override
- public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
- return true;
- }
-
- @Override
- public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
- if (serverHttpRequest instanceof ServletServerHttpRequest) {
- HttpServletRequest request = ((ServletServerHttpRequest) serverHttpRequest).getServletRequest();
- Object appAuth = request.getAttribute("appAuth");
- if (appAuth != null) {
- if (o instanceof R) {
- String appkey = request.getHeader("appkey");
- Object reqCache = request.getAttribute("cache");
- if (!Cools.isEmpty(appkey)) {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.saveLog(
- String.valueOf(appAuth),
- request.getRequestURI(),
- appkey,
- IpTools.gainRealIp(request),
- reqCache==null?"": JSON.toJSONString(reqCache),
- JSON.toJSONString(o),
- String.valueOf(((R) o).get("code")).equalsIgnoreCase("200")
- );
- }
- }
- }
- }
- return o;
- }
-
- public static String json(HttpServletRequest request) {
- try {
- BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8));
- StringBuilder sb = new StringBuilder();
- String inputStr;
- while ((inputStr = streamReader.readLine()) != null) {
- sb.append(inputStr);
- }
- return sb.toString();
- } catch (Exception e) {
- e.printStackTrace();
- return "";
- }
- }
-
-}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
deleted file mode 100644
index 3a87444..0000000
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.zy.asrs.openapi.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.openapi.entity.HostKey;
-import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
-import com.zy.asrs.common.openapi.entity.param.CreateMatParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakOutParam;
-import com.zy.asrs.common.openapi.entity.param.OrderListParam;
-import com.zy.asrs.common.openapi.service.ApiService;
-import com.zy.asrs.common.openapi.service.HostKeyService;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.DocType;
-import com.zy.asrs.common.wms.entity.OrderSettle;
-import com.zy.asrs.framework.annotations.AppAuth;
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@RestController
-@RequestMapping("/api")
-public class ApiController extends BaseController {
-
- @Autowired
- private HostKeyService hostKeyService;
- @Autowired
- private ApiService apiService;
-
- @PostMapping("/test")
- public R test() {
- return R.ok();
- }
-
- /**
- * 鐢熸垚鍏ュ簱璁㈠崟
- */
- @PostMapping("/generateOrderPakIn")
- @AppAuth(memo = "鐢熸垚鍏ュ簱璁㈠崟")
- public synchronized R generateOrderPakIn(@RequestHeader(required = true) String appkey,
- @RequestBody GenerateOrderPakInParam param) {
- HostKey hostKey = auth(appkey, param, true);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getMats())) {
- return R.error("鐗╂枡[mats]涓嶈兘涓虹┖");
- }
- param.setHostId(hostKey.getHostId());
- apiService.generateOrderPakIn(param);
- return R.ok();
- }
-
- /**
- * 鐢熸垚鍑哄簱璁㈠崟
- */
- @PostMapping("generateOrderPakOut")
- @AppAuth(memo = "鐢熸垚鍑哄簱璁㈠崟")
- public synchronized R generateOrderPakOut(@RequestHeader(required = false) String appkey,
- @RequestBody GenerateOrderPakOutParam param) {
- HostKey hostKey = auth(appkey, param, true);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getMats())) {
- return R.error("鐗╂枡[mats]涓嶈兘涓虹┖");
- }
- param.setHostId(hostKey.getHostId());
- apiService.generateOrderPakOut(param);
- return R.ok();
- }
-
- /**
- * 鑾峰彇璁㈠崟绫诲瀷
- */
- @PostMapping("/getOrderType")
- public synchronized R getOrderType(@RequestHeader(required = true) String appkey) {
- auth(appkey, null, false);
- List<DocType> list = apiService.getOrderType();
- return R.ok().add(list);
- }
-
- /**
- * 鑾峰彇璁㈠崟鐘舵�佸垪琛�
- */
- @PostMapping("/getOrderStatus")
- public synchronized R getOrderStatus(@RequestHeader(required = true) String appkey) {
- auth(appkey, null, false);
- List<OrderSettle> list = apiService.getOrderStatus();
- return R.ok().add(list);
- }
-
- /**
- * 鑾峰彇璁㈠崟鍒楄〃
- */
- @PostMapping("/getOrderList")
- public synchronized R getOrderList(@RequestHeader(required = true) String appkey,
- @RequestBody(required = false) OrderListParam param) {
- HostKey hostKey = auth(appkey, null, false);
- List<OrderListDto> orderList = apiService.getOrderList(param, hostKey.getHostId());
- return R.ok().add(orderList);
- }
-
- /**
- * 鍒涘缓鐗╂枡淇℃伅
- */
- @PostMapping("/createMat")
- public synchronized R createMat(@RequestHeader(required = true) String appkey,
- @RequestBody(required = false) CreateMatParam param) {
- HostKey hostKey = auth(appkey, param, true);
- param.setHostId(hostKey.getHostId());
- int result = apiService.createMat(param);
- return R.ok().add(result);
- }
-
- private HostKey auth(String appkey, Object obj, boolean signCheck) {
- request.setAttribute("cache", obj);
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appKey鏃犺锛�");
- }
-
- HostKey hostKey = hostKeyService.getOne(new LambdaQueryWrapper<HostKey>().eq(HostKey::getAppKey, appkey));
- if (hostKey == null) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appKey鏃犺锛�");
- }
-
- if (hostKey.getSignStatus() == 1 && signCheck) {
- //闇�瑕佽繘琛岀鍚嶆牎楠�
- //鍒涘缓鑷劧鎺掑簭map
- JSONObject param = new JSONObject(true);
- JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(obj));
- for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
- if (!entry.getKey().equals("sign")) {//鍓旈櫎sign
- param.put(entry.getKey(), entry.getValue());
- }
- }
- param.put("signKey", hostKey.getSignKey());
- String md5Hex = DigestUtils.md5Hex(param.toJSONString());
- if (!jsonObject.get("sign").toString().equals(md5Hex)) {
- throw new CoolException("绛惧悕鏍￠獙澶辫触");
- }
- }
-
- return hostKey;
- }
-
-}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiListController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiListController.java
deleted file mode 100644
index 01df9fa..0000000
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiListController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.zy.asrs.openapi.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.openapi.entity.ApiList;
-import com.zy.asrs.common.openapi.service.ApiListService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class ApiListController extends BaseController {
-
- @Autowired
- private ApiListService apiListService;
-
- @RequestMapping(value = "/apiList/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(apiListService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/apiList/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<ApiList> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(ApiList::getId, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(ApiList::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(ApiList::getCreateTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("url"))) {
- wrapper.eq(ApiList::getUrl, param.get("url"));
- }
- if (!Cools.isEmpty(param.get("type"))) {
- wrapper.eq(ApiList::getType, param.get("type"));
- }
- if (!Cools.isEmpty(param.get("status"))) {
- wrapper.eq(ApiList::getStatus, param.get("status"));
- }
- if (!Cools.isEmpty(param.get("hostId"))) {
- wrapper.eq(ApiList::getHostId, param.get("hostId"));
- }
- return R.ok(apiListService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/apiList/add/auth")
- @ManagerAuth
- public R add(ApiList apiList) {
- ApiList one = apiListService.getOne(new LambdaQueryWrapper<ApiList>()
- .eq(ApiList::getUrl, apiList.getUrl())
- .eq(ApiList::getType, apiList.getType())
- .eq(ApiList::getHostId, apiList.getHostId()));
- if (one != null) {
- apiListService.removeById(one.getId());
- }
- apiList.setCreateTime(new Date());
- apiListService.save(apiList);
- return R.ok();
- }
-
- @RequestMapping(value = "/apiList/update/auth")
- @ManagerAuth
- public R update(ApiList apiList){
- if (Cools.isEmpty(apiList) || null==apiList.getId()){
- return R.error();
- }
- apiList.setCreateTime(new Date());
- apiListService.updateById(apiList);
- return R.ok();
- }
-
- @RequestMapping(value = "/apiList/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- apiListService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/apiListQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<ApiList> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(ApiList::getId, condition);
- Page<ApiList> page = apiListService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (ApiList apiList : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", apiList.getId());
- map.put("value", apiList.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/apiList/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<ApiList> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(ApiList::getId, condition);
- }
- apiListService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiLogController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiLogController.java
deleted file mode 100644
index 0e87b3b..0000000
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiLogController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.zy.asrs.openapi.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.openapi.entity.ApiLog;
-import com.zy.asrs.common.openapi.service.ApiLogService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class ApiLogController extends BaseController {
-
- @Autowired
- private ApiLogService apiLogService;
-
- @RequestMapping(value = "/apiLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(apiLogService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/apiLog/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<ApiLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(ApiLog::getUuid, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(ApiLog::getCreateTime, DateUtils.convert(range[0]));
- wrapper.le(ApiLog::getCreateTime, DateUtils.convert(range[1]));
- }
- return R.ok(apiLogService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/apiLog/add/auth")
- @ManagerAuth
- public R add(ApiLog apiLog) {
- apiLogService.save(apiLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/apiLog/update/auth")
- @ManagerAuth
- public R update(ApiLog apiLog){
- if (Cools.isEmpty(apiLog) || null==apiLog.getId()){
- return R.error();
- }
- apiLogService.updateById(apiLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/apiLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- apiLogService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/apiLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<ApiLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(ApiLog::getUuid, condition);
- Page<ApiLog> page = apiLogService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (ApiLog apiLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", apiLog.getId());
- map.put("value", apiLog.getUuid());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/apiLog/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<ApiLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(ApiLog::getUuid, condition);
- }
- apiLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getUuid()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/HostKeyController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/HostKeyController.java
deleted file mode 100644
index 9fca8dd..0000000
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/HostKeyController.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.zy.asrs.openapi.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.openapi.entity.HostKey;
-import com.zy.asrs.common.openapi.service.HostKeyService;
-import com.zy.asrs.common.sys.service.HostService;
-import com.zy.asrs.common.utils.Utils;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class HostKeyController extends BaseController {
-
- @Autowired
- private HostKeyService hostKeyService;
- @Autowired
- private HostService hostService;
-
- @RequestMapping(value = "/hostKey/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(hostKeyService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/hostKey/list/auth")
- @ManagerAuth
- public R list() {
- return R.ok(hostKeyService.getList());
- }
-
- @RequestMapping(value = "/hostKey/switchSign/auth")
- @ManagerAuth
- public R switchSign(HostKey hostKey) {
- Date now = new Date();
- HostKey one = hostKeyService.getOne(new LambdaQueryWrapper<HostKey>().eq(HostKey::getHostId, hostKey.getHostId()));
- if (one == null) {
- return R.error("鏈敓鎴愮鍚嶅瘑閽�");
- }
- if (one.getSignKey() == null) {
- return R.error("鏈敓鎴愮鍚嶅瘑閽�");
- }
-
- one.setSignStatus(hostKey.getSignStatus());
- one.setCreateTime(now);
- hostKeyService.saveOrUpdate(one);
- return R.ok().add(hostKey);
- }
-
- @RequestMapping(value = "/hostKey/generateSignKey/auth")
- @ManagerAuth
- public R generateSignKey(HostKey hostKey) {
- StringBuffer buffer = new StringBuffer();
- buffer.append(Utils.generateString(32));
- buffer.append(System.currentTimeMillis());
- String md5Hex = DigestUtils.md5Hex(buffer.toString());
-
- HostKey one = hostKeyService.getOne(new LambdaQueryWrapper<HostKey>().eq(HostKey::getHostId, hostKey.getHostId()));
- if (one != null) {
- hostKey = one;
- }else {
- hostKey.setSignStatus(0);
- }
-
- hostKey.setSignKey(md5Hex);
- hostKey.setCreateTime(new Date());
- hostKeyService.saveOrUpdate(hostKey);
- return R.ok().add(hostKey);
- }
-
- @RequestMapping(value = "/hostKey/generateAppKey/auth")
- @ManagerAuth
- public R generateAppKey(HostKey hostKey) {
- StringBuffer buffer = new StringBuffer();
- buffer.append(Utils.generateString(32));
- buffer.append(System.currentTimeMillis());
- String md5Hex = DigestUtils.md5Hex(buffer.toString());
-
- HostKey one = hostKeyService.getOne(new LambdaQueryWrapper<HostKey>().eq(HostKey::getHostId, hostKey.getHostId()));
- if (one != null) {
- hostKey = one;
- }else {
- hostKey.setSignStatus(0);
- }
-
- hostKey.setAppKey(md5Hex);
- hostKey.setCreateTime(new Date());
- hostKeyService.saveOrUpdate(hostKey);
- return R.ok().add(hostKey);
- }
-
- @RequestMapping(value = "/hostKey/update/auth")
- @ManagerAuth
- public R update(HostKey hostKey){
- if (Cools.isEmpty(hostKey) || null==hostKey.getId()){
- return R.error();
- }
- hostKeyService.updateById(hostKey);
- return R.ok();
- }
-
- @RequestMapping(value = "/hostKey/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- hostKeyService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/hostKeyQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<HostKey> wrapper = new LambdaQueryWrapper<>();
- wrapper.like(HostKey::getId, condition);
- Page<HostKey> page = hostKeyService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (HostKey hostKey : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", hostKey.getId());
- map.put("value", hostKey.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/hostKey/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<HostKey> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(HostKey::getId, condition);
- }
- hostKeyService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
- @RequestMapping("/host/list")
- public R getHostList() {
- return R.ok().add(hostService.list());
- }
-
-}
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java
deleted file mode 100644
index 7df4a01..0000000
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.zy.asrs.openapi.task;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.ReportStockDto;
-import com.zy.asrs.common.domain.enums.ApiType;
-import com.zy.asrs.common.domain.enums.OrderSettleType;
-import com.zy.asrs.common.openapi.entity.ApiList;
-import com.zy.asrs.common.openapi.entity.HostKey;
-import com.zy.asrs.common.openapi.service.ApiListService;
-import com.zy.asrs.common.openapi.service.HostKeyService;
-import com.zy.asrs.common.utils.HttpHandler;
-import com.zy.asrs.common.wms.entity.Order;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.common.wms.service.OrderDetlService;
-import com.zy.asrs.common.wms.service.OrderService;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class ReportApiScheduler {
-
- @Autowired
- private ApiListService apiListService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private HostKeyService hostKeyService;
- @Autowired
- private LocDetlService locDetlService;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- public void orderComplete() {
- //璁㈠崟瀹屾垚涓婃姤
-
- //鑾峰彇宸插畬鎴愯鍗�
- List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
- .eq(Order::getSettle, OrderSettleType.COMPLETE.id));
- for (Order order : list) {
- //鏌ヨ鏄惁闇�瑕佷笂鎶�
- ApiList apiList = apiListService.getOne(new LambdaQueryWrapper<ApiList>()
- .eq(ApiList::getType, ApiType.ORDER_COMPLETE.type)
- .eq(ApiList::getStatus, 1)
- .eq(ApiList::getHostId,order.getHostId()));
- if (apiList == null) {
- continue;
- }
-
- //鑾峰彇璁㈠崟鏄庣粏
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
- .eq(OrderDetl::getOrderId, order.getId()));
-
- //灏佽鏁版嵁
- HashMap<String, Object> data = new HashMap<>();
- data.put("order", order);
- data.put("orderDetls", orderDetls);
-
- getSign(data, order.getHostId());//鑾峰彇绛惧悕
-
- try {
- String response = new HttpHandler.Builder()
- .setUri(apiList.getUrl())
- .setJson(JSON.toJSONString(data))
- .build()
- .doPost();
- JSONObject result = JSON.parseObject(response);
- if (result.getOrDefault("code", 0).equals(200)) {
- order.setSettle(OrderSettleType.REPORT_COMPLETE.id.longValue());
- order.setUpdateTime(new Date());
- orderService.updateById(order);//鏇存柊璁㈠崟鐘舵��
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- @Scheduled(cron = "0/3 * * * * ? ")
- public void orderCancel() {
- //璁㈠崟鍙栨秷涓婃姤
-
- //鑾峰彇宸插彇娑堣鍗�
- List<Order> list = orderService.list(new LambdaQueryWrapper<Order>()
- .eq(Order::getSettle, OrderSettleType.CANCEL.id));
- for (Order order : list) {
- //鏌ヨ鏄惁闇�瑕佷笂鎶�
- ApiList apiList = apiListService.getOne(new LambdaQueryWrapper<ApiList>()
- .eq(ApiList::getType, ApiType.ORDER_CANCEL.type)
- .eq(ApiList::getStatus, 1)
- .eq(ApiList::getHostId,order.getHostId()));
- if (apiList == null) {
- continue;
- }
-
- //鑾峰彇璁㈠崟鏄庣粏
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
- .eq(OrderDetl::getOrderId, order.getId()));
-
- //灏佽鏁版嵁
- HashMap<String, Object> data = new HashMap<>();
- data.put("order", order);
- data.put("orderDetls", orderDetls);
-
- getSign(data, order.getHostId());//鑾峰彇绛惧悕
-
- try {
- String response = new HttpHandler.Builder()
- .setUri(apiList.getUrl())
- .setJson(JSON.toJSONString(data))
- .build()
- .doPost();
- JSONObject result = JSON.parseObject(response);
- if (result.getOrDefault("code", 0).equals(200)) {
- order.setSettle(OrderSettleType.REPORT_COMPLETE.id.longValue());
- order.setUpdateTime(new Date());
- orderService.updateById(order);//鏇存柊璁㈠崟鐘舵��
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- @Scheduled(cron = "* 30 23 * * ? ")
- public void reportStock() {
- //搴撳瓨涓婃姤
- //姣忓ぉ鏅氫笂11鐐瑰崐鎵ц
-
- //鏌ヨ鏄惁闇�瑕佷笂鎶�
- List<ApiList> list = apiListService.list(new LambdaQueryWrapper<ApiList>()
- .eq(ApiList::getType, ApiType.REPORT_STOCK.type)
- .eq(ApiList::getStatus, 1));
- for (ApiList apiList : list) {
- List<ReportStockDto> reportStockDto = locDetlService.getReportStockDto(apiList.getHostId());
- //灏佽鏁版嵁
- HashMap<String, Object> data = new HashMap<>();
- data.put("stock", reportStockDto);
- getSign(data, apiList.getHostId());//鑾峰彇绛惧悕
-
- //淇濈暀null鍊�
- FastJsonConfig fastJsonConfig = new FastJsonConfig();
- fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullListAsEmpty, SerializerFeature.WriteNullStringAsEmpty);
- String paramData = JSON.toJSONString(data, fastJsonConfig.getSerializeConfig(), fastJsonConfig.getSerializerFeatures());
- try {
- String response = new HttpHandler.Builder()
- .setUri(apiList.getUrl())
- .setJson(JSON.toJSONString(paramData))
- .build()
- .doPost();
- JSONObject result = JSON.parseObject(response);
- if (result.getOrDefault("code", 0).equals(200)) {
-
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-
- //鑾峰彇绛惧悕
- public String getSign(HashMap<String, Object> data, Long hostId) {
- HostKey hostKey = hostKeyService.getOne(new LambdaQueryWrapper<HostKey>()
- .eq(HostKey::getHostId, hostId));
- if (hostKey == null) {
- return null;
- }
-
- if (hostKey.getSignStatus() == 0) {//娌℃湁寮�鍚鍚�
- return null;
- }
-
- //鍒涘缓鑷劧鎺掑簭map
- JSONObject param = new JSONObject(true);
- for (Map.Entry<String, Object> entry : data.entrySet()) {
- if (!entry.getKey().equals("sign")) {//鍓旈櫎sign
- param.put(entry.getKey(), entry.getValue());
- }
- }
- param.put("signKey", hostKey.getSignKey());
- String md5Hex = DigestUtils.md5Hex(param.toJSONString());
- data.put("sign", md5Hex);
- return md5Hex;
- }
-
-}
--
Gitblit v1.9.1