Skip to content

G
gdtel-gztel-school-center
Commit 7baf6f30 by 吴学德
Options

Merge remote-tracking branch 'origin/master'

parents 378cdabe dfedab08
Showing with 21 additions and 16 deletions
deploy/upload.sh
#!/bin/bash #!/bin/bash
# cp ../eureka/target/*.jar prod/winsun-docker-application-list/eureka/ cp ../eureka/target/*.jar prod/winsun-docker-application-list/eureka/
# cp ../gateway/target/*.jar prod/winsun-docker-application-list/gateway/ cp ../gateway/target/*.jar prod/winsun-docker-application-list/gateway/
# cp ../core-service/target/*.jar prod/winsun-docker-application-list/core/ cp ../core-service/target/*.jar prod/winsun-docker-application-list/core/
cp ../apply-net/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/applynet/ cp ../apply-net/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/applynet/
cp ../service-manager/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/manager/ cp ../service-manager/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/manager/
...@@ -11,6 +11,9 @@ cp ../old-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-scho ...@@ -11,6 +11,9 @@ cp ../old-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-scho
cp ../renewal-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/renewaluser/ cp ../renewal-user/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/renewaluser/
cp ../task/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/task/ cp ../task/target/*.jar prod/winsun-docker-application-list/gdtel-gztel-school-center/task/
# scp -r prod/winsun-docker-application-list/eureka/eureka.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/eureka/eureka.jar
# scp -r prod/winsun-docker-application-list/gateway/gateway.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gateway/gateway.jar
# scp -r prod/winsun-docker-application-list/core/core.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/core/core.jar # scp -r prod/winsun-docker-application-list/core/core.jar liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/core/core.jar
# scp -r prod/winsun-docker-application-list/ liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list # scp -r prod/winsun-docker-application-list/ liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list
scp -r prod/winsun-docker-application-list/gdtel-gztel-school-center/* liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gdtel-gztel-school-center scp -r prod/winsun-docker-application-list/gdtel-gztel-school-center/* liph@172.18.101.171:/datas/apps/web/jars/winsun-docker-application-list/gdtel-gztel-school-center/
task/src/main/java/com/winsun/TimingTask/OrderTask.java
/*
package com.winsun.TimingTask; package com.winsun.TimingTask;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
...@@ -36,35 +36,37 @@ public class OrderTask { ...@@ -36,35 +36,37 @@ public class OrderTask {
} }
//@Scheduled(cron = "0 15 10 * * ? ") @Scheduled(cron = "0 15 10 * * ? ")
@Scheduled(cron = "0/5 * * * * ? ") //@Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/orderTask") @PostMapping("/orderTask")
public void general() throws ParseException { public void general() throws ParseException {
Wrapper<Order> wrapper = new EntityWrapper(); Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("order_status", "待识别1"); wrapper.eq("order_status", "待识别");
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
orders.forEach(order -> { orders.forEach(order -> {
try { try {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
log.info(jsonObject.toJSONString());
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13") || if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13") ||
Map.get("orderStatus").toString().equals("8") || Map.get("orderStatus").toString().equals("22") || Map.get("orderState").toString().equals("8") || Map.get("orderState").toString().equals("22") ||
Map.get("orderStatus").toString().equals("21") ){ Map.get("orderState").toString().equals("21") ){
Wrapper<Order> wrapper1 = new EntityWrapper(); Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode")); wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId()); wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "待处理"); dataMapping.put("order_status", "待处理");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新");
} }
} catch (Exception e) { } catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
}); });
/* Wrapper<Order> wrapper2 = new EntityWrapper(); Wrapper<Order> wrapper2 = new EntityWrapper();
wrapper2.eq("order_status", "待活体"); wrapper2.eq("order_status", "待活体");
List<Order> orders1 = orderMapper.selectList(wrapper); List<Order> orders1 = orderMapper.selectList(wrapper);
orders1.forEach(order -> { orders1.forEach(order -> {
...@@ -72,19 +74,20 @@ public class OrderTask { ...@@ -72,19 +74,20 @@ public class OrderTask {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId()); JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
String dataArray = jsonObject.getString("dataArray"); String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class); Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13")){ if(Map.get("orderState").toString().equals("3") || Map.get("orderState").toString().equals("13")){
Wrapper<Order> wrapper1 = new EntityWrapper(); Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode")); wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId()); wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新");
} }
} catch (Exception e) { } catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage()); log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
} }
});*/ });
} }
} }*/
\ No newline at end of file
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