三木森设备调试完成

dev
胡锐 3 months ago
parent 0a80b23e30
commit 99dcfe8c5b
  1. 6
      bweb/src/main/java/com/bweb/controller/BsDeviceController.java
  2. 26
      bweb/src/main/java/com/bweb/controller/BsGasClassGroupTaskController.java
  3. 48
      bweb/src/main/java/com/bweb/controller/TestController.java
  4. 14
      bweb/src/main/resources/dev/application.yml
  5. 14
      bweb/src/main/resources/prod/application.yml
  6. 14
      cweb/src/main/resources/dev/application.yml
  7. 14
      cweb/src/main/resources/prod/application.yml
  8. 14
      cweb/src/main/resources/prod2/application.yml
  9. 4
      service/pom.xml
  10. 40
      service/src/main/java/com/hfkj/config/MqttProviderCallBack.java
  11. 234
      service/src/main/java/com/hfkj/config/MqttProviderConfig.java
  12. 298
      service/src/main/java/com/hfkj/device/sanmisen/PrinterTemplate.java
  13. 2
      service/src/main/java/com/hfkj/device/spyun/SpPrinterConfig.java
  14. 6
      service/src/main/java/com/hfkj/device/spyun/SpPrinterTemplate.java
  15. 25
      service/src/main/java/com/hfkj/service/gas/impl/BsGasClassGroupTaskServiceImpl.java
  16. 49
      service/src/main/java/com/hfkj/service/impl/BsDeviceServiceImpl.java
  17. 1
      service/src/main/java/com/hfkj/sysenum/DeviceTypeEnum.java

@ -8,7 +8,7 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.SpPrinterConfig;
import com.hfkj.device.spyun.SpPrinterConfig;
import com.hfkj.entity.*;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
@ -16,7 +16,6 @@ import com.hfkj.service.BsDeviceService;
import com.hfkj.service.merchant.BsMerchantService;
import com.hfkj.sysenum.DeviceReceiptOutContentEnum;
import com.hfkj.sysenum.DeviceTypeEnum;
import com.hfkj.sysenum.MerchantSourceTypeEnum;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -60,11 +59,10 @@ public class BsDeviceController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的设备类型");
}
if (body.getType().equals(DeviceTypeEnum.type1.getType())
if ((body.getType().equals(DeviceTypeEnum.type1.getType()) || body.getType().equals(DeviceTypeEnum.type2.getType()))
&& (StringUtils.isBlank(body.getDeviceSn()) || StringUtils.isBlank(body.getDeviceKey()))) {
log.error("BsDeviceController -> editDevice() error!","参数错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
BsDevice device;

@ -8,11 +8,12 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.SpPrinterConfig;
import com.hfkj.config.SpPrinterTemplate;
import com.hfkj.config.MqttProviderConfig;
import com.hfkj.device.sanmisen.PrinterTemplate;
import com.hfkj.device.spyun.SpPrinterConfig;
import com.hfkj.device.spyun.SpPrinterTemplate;
import com.hfkj.entity.BsDevice;
import com.hfkj.entity.BsGasClassGroupTask;
import com.hfkj.entity.BsGasStaff;
import com.hfkj.model.GasClassGroupTaskDataCount;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
@ -52,10 +53,10 @@ public class BsGasClassGroupTaskController {
private BsDeviceService deviceService;
@Resource
private BsGasStaffService gasStaffService;
/* @Resource
private MqttProviderConfig mqttProviderConfig;*/
@Resource
private UserCenter userCenter;
@Resource
private MqttProviderConfig mqttProviderConfig;
@RequestMapping(value = "/startGroupTask", method = RequestMethod.POST)
@ResponseBody
@ -256,6 +257,21 @@ public class BsGasClassGroupTaskController {
e.printStackTrace();
}
}).start();
} else if (device.getType().equals(DeviceTypeEnum.type2.getType())) {
new Thread(() -> {
try {
JSONObject param = new JSONObject();
param.put("id", System.currentTimeMillis());
param.put("type", 5);
param.put("vType", 0);
param.put("vMessage", "补打班结数据汇总,请注意查收");
param.put("contents", PrinterTemplate.classGroupCountTemp(dataCount ,true));
mqttProviderConfig.publish(1, false, device.getDeviceSn()+"/submsg", param.toJSONString());
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
}

@ -11,9 +11,15 @@ import com.hfkj.common.utils.HttpUtils;
import com.hfkj.common.utils.HttpsUtils;
import com.hfkj.common.utils.MD5Util;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.MqttProviderConfig;
import com.hfkj.device.sanmisen.PrinterTemplate;
import com.hfkj.entity.BsGasClassGroupTask;
import com.hfkj.entity.BsGasOrder;
import com.hfkj.entity.SecUser;
import com.hfkj.model.GasClassGroupTaskDataCount;
import com.hfkj.model.ResponseData;
import com.hfkj.service.gas.BsGasClassGroupTaskService;
import com.hfkj.service.gas.BsGasOrderService;
import com.hfkj.service.sec.SecUserLoginLogService;
import com.hfkj.service.sec.SecUserService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
@ -41,10 +47,10 @@ public class TestController {
@Resource
private SecUserLoginLogService secUserLoginLogService;
@RequestMapping(value="/editUser",method = RequestMethod.GET)
@RequestMapping(value="gasSyncPayment",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "编辑用户")
public ResponseData editUser() {
@ApiOperation(value = "壳牌推送")
public ResponseData gasSyncPayment() {
try {
JSONObject response = HttpsUtils.doGet("https://oil.dctpay.com/crest/gasOrder/queryOilOrder?orderNo=240804110524374697");
@ -52,7 +58,7 @@ public class TestController {
BsGasOrder gasOrder = JSONObject.parseObject(response.getJSONObject("return_data").toJSONString(), BsGasOrder.class);
// 推送加好油【重庆壳牌】
JSONObject object = CqShellPetroleumRequestService.gasSyncPayment(gasOrder.getOrderNo(),
JSONObject object = CqShellPetroleumRequestService.gasSyncPayment("CT"+gasOrder.getOrderNo(),
gasOrder.getMerNo(),
gasOrder.getPayTime(),
gasOrder.getGasRefuelPrice(),
@ -61,7 +67,6 @@ public class TestController {
gasOrder.getPayablePrice(),
gasOrder.getTotalDeductionPrice()
);
return ResponseMsgUtil.success(object);
} catch (Exception e) {
@ -70,6 +75,39 @@ public class TestController {
}
}
@Resource
private MqttProviderConfig mqttProviderConfig;
@Resource
private BsGasOrderService gasOrderService;
@Resource
private BsGasClassGroupTaskService gasClassGroupTaskService;
@RequestMapping(value="oilReceipt",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "壳牌推送")
public ResponseData oilReceipt() {
try {
JSONObject param = new JSONObject();
param.put("id", System.currentTimeMillis());
param.put("type", 5);
//param.put("vType", 0);
//param.put("vMessage", "嗨加油新订单,加油金额"+gasOrder.getGasRefuelPrice()+"元,请注意查收");
// param.put("contents", PrinterTemplate.oilReceipt(1, gasOrderService.getDetailByOrderNo("240726140647722244"), new HashMap<>(), false));
BsGasClassGroupTask groupTask = gasClassGroupTaskService.getDetailById(187L);
GasClassGroupTaskDataCount dataCount = gasClassGroupTaskService.countGroupTaskData(groupTask.getMerId(), groupTask.getClassNum(), groupTask.getId(), groupTask.getStatus(), groupTask.getStartTime(), groupTask.getEndTime());
param.put("contents", PrinterTemplate.classGroupCountTemp(dataCount ,true));
mqttProviderConfig.publish(1, false, "SW242300044/submsg", param.toJSONString());
return ResponseMsgUtil.success("");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -39,6 +39,20 @@ spring:
max-wait: -1
max-idle: 10
min-idle: 0
#MQTT配置信息
mqtt:
#MQTT服务地址
url: ws://139.9.154.68:8083/mqtt
#用户名
username: printer_provider
#密码
password: 123654
#客户端id(不能重复)
# client:
# id: provider-id
#MQTT默认的消息推送主题,实际可在调用接口是指定
# default:
# topic: topic
#配置日期返回至前台为时间戳
jackson:
serialization:

@ -39,6 +39,20 @@ spring:
max-wait: -1
max-idle: 10
min-idle: 0
#MQTT配置信息
mqtt:
#MQTT服务地址
url: ws://1.95.43.71:8083/mqtt
#用户名
username: printer_provider
#密码
password: abcd123!
#客户端id(不能重复)
# client:
# id: provider-id
#MQTT默认的消息推送主题,实际可在调用接口是指定
# default:
# topic: topic
#配置日期返回至前台为时间戳
jackson:
serialization:

@ -39,6 +39,20 @@ spring:
max-wait: -1
max-idle: 10
min-idle: 0
#MQTT配置信息
mqtt:
#MQTT服务地址
url: ws://139.9.154.68:8083/mqtt
#用户名
username: printer_provider
#密码
password: 123654
#客户端id(不能重复)
# client:
# id: provider-id
#MQTT默认的消息推送主题,实际可在调用接口是指定
# default:
# topic: topic
#配置日期返回至前台为时间戳
jackson:
serialization:

@ -39,6 +39,20 @@ spring:
max-wait: -1
max-idle: 10
min-idle: 0
#MQTT配置信息
mqtt:
#MQTT服务地址
url: ws://1.95.43.71:8083/mqtt
#用户名
username: printer_provider
#密码
password: abcd123!
#客户端id(不能重复)
# client:
# id: provider-id
#MQTT默认的消息推送主题,实际可在调用接口是指定
# default:
# topic: topic
#配置日期返回至前台为时间戳
jackson:
serialization:

@ -39,6 +39,20 @@ spring:
max-wait: -1
max-idle: 10
min-idle: 0
#MQTT配置信息
mqtt:
#MQTT服务地址
url: ws://1.95.43.71:8083/mqtt
#用户名
username: printer_provider
#密码
password: abcd123!
#客户端id(不能重复)
# client:
# id: provider-id
#MQTT默认的消息推送主题,实际可在调用接口是指定
# default:
# topic: topic
#配置日期返回至前台为时间戳
jackson:
serialization:

@ -255,6 +255,10 @@
<artifactId>jetcache-starter-redis</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>

@ -0,0 +1,40 @@
package com.hfkj.config;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.springframework.context.annotation.Configuration;
@Configuration
public class MqttProviderCallBack implements MqttCallback {
/**
* 与服务器断开
* @param throwable
*/
@Override
public void connectionLost(Throwable throwable) {
}
/**
* 消息到达回调
* @param s
* @param mqttMessage
* @throws Exception
*/
@Override
public void messageArrived(String s, MqttMessage mqttMessage) throws Exception {
System.out.println("消息到达");
}
/**
* 消息发布成功回调
* @param iMqttDeliveryToken
*/
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
System.out.println("消息发布");
}
}

@ -0,0 +1,234 @@
package com.hfkj.config;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@Configuration
@Slf4j
public class MqttProviderConfig {
@Value("${spring.mqtt.username}")
private String username;
@Value("${spring.mqtt.password}")
private String password;
@Value("${spring.mqtt.url}")
private String hostUrl;
/* @Value("${spring.mqtt.client.id}")
private String clientId;
@Value("${spring.mqtt.default.topic}")
private String defaultTopic;*/
/**
* 客户端对象
*/
private MqttClient client;
/**
* 在bean初始化后连接到服务器
*/
// @PostConstruct
public void init() {
connect("provider-" + System.currentTimeMillis());
}
/*
@PostConstruct
public void init(String clientId) {
connect(clientId);
}*/
/**
* 客户端连接服务端
*/
public void connect(String clientId){
try{
//创建MQTT客户端对象
client = new MqttClient(hostUrl,clientId,new MemoryPersistence());
//连接设置
MqttConnectOptions options = new MqttConnectOptions();
//是否清空session,设置false表示服务器会保留客户端的连接记录(订阅主题,qos),客户端重连之后能获取到服务器在客户端断开连接期间推送的消息
//设置为true表示每次连接服务器都是以新的身份
options.setCleanSession(true);
//设置连接用户名
options.setUserName(username);
//设置连接密码
options.setPassword(password.toCharArray());
//设置超时时间,单位为秒
options.setConnectionTimeout(100);
//设置心跳时间 单位为秒,表示服务器每隔 1.5*20秒的时间向客户端发送心跳判断客户端是否在线
options.setKeepAliveInterval(20);
// 设置遗嘱消息的话题,若客户端和服务器之间的连接意外断开,服务器将发布客户端的遗嘱信息
// options.setWill("willTopic",(clientId + "与服务器断开连接").getBytes(),0,false);
//设置回调
client.setCallback(new MqttProviderCallBack());
client.connect(options);
} catch(MqttException e){
e.printStackTrace();
}
}
public void publish(int qos,boolean retained,String topic,String message) {
if (client == null) {
init();
}
if (!client.isConnected()) {
init();
}
try {
MqttMessage mqttMessage = new MqttMessage();
mqttMessage.setQos(qos);
mqttMessage.setRetained(retained);
mqttMessage.setPayload(message.getBytes());
client.subscribe(topic, qos);
// 主题的目的地,用于发布/订阅信息
MqttTopic mqttTopic = client.getTopic(topic);
//提供一种机制来跟踪消息的传递进度
//用于在以非阻塞方式(在后台运行)执行发布是跟踪消息的传递进度
MqttDeliveryToken token;
//将指定消息发布到主题,但不等待消息传递完成,返回的token可用于跟踪消息的传递状态
//一旦此方法干净地返回,消息就已被客户端接受发布,当连接可用,将在后台完成消息传递
token = mqttTopic.publish(mqttMessage);
token.waitForCompletion();
} catch (MqttException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
public void publish(int qos,boolean retained,String topic,byte[] message) {
if (client == null) {
init();
}
if (!client.isConnected()) {
init();
}
try {
MqttMessage mqttMessage = new MqttMessage();
mqttMessage.setQos(qos);
mqttMessage.setRetained(retained);
mqttMessage.setPayload(message);
// 主题的目的地,用于发布/订阅信息
MqttTopic mqttTopic = client.getTopic(topic);
//提供一种机制来跟踪消息的传递进度
//用于在以非阻塞方式(在后台运行)执行发布是跟踪消息的传递进度
MqttDeliveryToken token;
//将指定消息发布到主题,但不等待消息传递完成,返回的token可用于跟踪消息的传递状态
//一旦此方法干净地返回,消息就已被客户端接受发布,当连接可用,将在后台完成消息传递
token = mqttTopic.publish(mqttMessage);
token.waitForCompletion();
} catch (MqttException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
public static byte[] sendPrinterRrCodeBytest(String printText, int pageCount) {
try {
byte[] by = printText.getBytes();
byte[] msgByte = new byte[by.length + 16];
// 写入缓存
msgByte[0] = 29;
msgByte[1] = 40;
msgByte[2] = 107;
msgByte[3] = (byte)(by.length+3);
msgByte[4] = 0;
msgByte[5] = 49;
msgByte[6] = 80;
msgByte[7] = 48; // (byte)0x30);
int index = 7;
for (int i = 0; i < by.length; i++)
{
index = index+1;
msgByte[index] = by[i];
}
// 打印缓存中的数据
msgByte[index + 1] = 29;
msgByte[index + 2] = 40;
msgByte[index + 3] = 107;
msgByte[index + 4] = (byte)(by.length+3);
msgByte[index + 5] = 0;
msgByte[index + 6] = 49;
msgByte[index + 7] = 81;
msgByte[index + 8] = 48; // (byte)0x30);
byte[] array = new byte[msgByte.length + 9];
array[0] = 30;
array[1] = 16;
array[2] =(byte) pageCount;//打印份数
int num = array.length - 5;
array[3] = (byte)(num >> 8);
//array[4] = (byte)((uint)num & 0xFFu);
array[4] = (byte)(num & 0xFF);
for (int i = 0; i < msgByte.length; i++)
{
array[i+ 5] = msgByte[i];
}
array[array.length - 4] = 27;
array[array.length - 3] = 99;
byte[] crc16CodeArray = getCRC(msgByte);
array[array.length - 2] = crc16CodeArray[0];
array[array.length - 1] = crc16CodeArray[1];
return array;
} catch (Exception ex) {
System.out.println(ex.getStackTrace());
}
return null;
}
private static byte[] getCRC(byte[] bytes) {
int crc = 0xFFFF; // 初始值
for (byte b : bytes) {
crc = (crc >> 8) ^ CRC16Table[(crc ^ b) & 0xff];
}
byte[] b = new byte[2];
b[0] = (byte) ((crc >> 8)^0xff);
b[1] = (byte) ((crc & 0xff)^0xff);
return b;
}
private static int[] CRC16Table = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624,
0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c,
0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5,
0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed,
0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726,
0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e,
0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7,
0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef,
0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420,
0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868,
0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1,
0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9,
0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a,
0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3,
0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb,
0xa862, 0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c,
0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64,
0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad,
0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5,
0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e,
0xf2a7, 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66,
0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af,
0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7,
0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028,
0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9,
0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1,
0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a,
0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62,
0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab,
0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3,
0x2c6a, 0x1ef1, 0x0f78 };
}

@ -0,0 +1,298 @@
package com.hfkj.device.sanmisen;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.entity.BsGasOrder;
import com.hfkj.model.GasClassGroupTaskDataCount;
import com.hfkj.model.GasClassGroupTaskOilCount;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 三木森 小票打印机内容模板
* @className: PrinterTemplate
* @author: HuRui
* @date: 2024/8/8
**/
public class PrinterTemplate {
/**
* 班次统计模板
* @param dataCount 班次数据统计
* @param makeUp 是否补打 true: flase:
* @return
*/
public static JSONArray classGroupCountTemp(GasClassGroupTaskDataCount dataCount, boolean makeUp) {
JSONArray contents = new JSONArray();
JSONObject merName = new JSONObject();
merName.put("cont", dataCount.getClassNum() + "班结流水" + (makeUp?"(补打)":""));
merName.put("type", "text");
merName.put("align", "center");
merName.put("bold", true);
contents.add(merName);
// 空格
JSONObject blank1 = new JSONObject();
blank1.put("cont", "");
blank1.put("type", "text");
contents.add(blank1);
// 分割线
JSONObject divLine1 = new JSONObject();
divLine1.put("cont", "");
divLine1.put("type", "div_star");
contents.add(divLine1);
// 开始时间
JSONObject startTime = new JSONObject();
startTime.put("cont", "开始时间:" + DateUtil.date2String(dataCount.getStartTime(), DateUtil.Y_M_D_HMS));
startTime.put("type", "text");
contents.add(startTime);
// 结束时间
JSONObject endTime = new JSONObject();
endTime.put("cont", "结束时间:" + DateUtil.date2String(dataCount.getEndTime(), DateUtil.Y_M_D_HMS));
endTime.put("type", "text");
contents.add(endTime);
// 空格
JSONObject blank2 = new JSONObject();
blank2.put("cont", "");
blank2.put("type", "text");
contents.add(blank2);
// 加油金额汇总
JSONObject totalOilPrice = new JSONObject();
totalOilPrice.put("cont", "加油金额汇总:" + dataCount.getRefuelPrice() + "元");
totalOilPrice.put("type", "text");
contents.add(totalOilPrice);
// 加油笔数汇总
JSONObject totalOilNum = new JSONObject();
totalOilNum.put("cont", "加油笔数汇总:" + dataCount.getRefuelNum() + "笔");
totalOilNum.put("type", "text");
contents.add(totalOilNum);
// 加油升数汇总
JSONObject totalOilLiters = new JSONObject();
totalOilLiters.put("cont", "加油升数汇总:" + dataCount.getRefuelLiters() + "升");
totalOilLiters.put("type", "text");
contents.add(totalOilLiters);
// 空格
JSONObject blank3 = new JSONObject();
blank3.put("cont", "");
blank3.put("type", "text");
contents.add(blank3);
// 退款金额汇总
JSONObject totalRefundPrice = new JSONObject();
totalRefundPrice.put("cont", "退款金额汇总:" + dataCount.getRefundPrice() + "元");
totalRefundPrice.put("type", "text");
contents.add(totalRefundPrice);
// 退款笔数汇总
JSONObject totalRefundNum = new JSONObject();
totalRefundNum.put("cont", "退款笔数汇总:" + dataCount.getRefundNum() + "笔");
totalRefundNum.put("type", "text");
contents.add(totalRefundNum);
// 退款升数汇总
JSONObject totalRefundLiters = new JSONObject();
totalRefundLiters.put("cont", "退款升数汇总:" + dataCount.getRefundLiters() + "升");
totalRefundLiters.put("type", "text");
contents.add(totalRefundLiters);
// 空格
JSONObject blank4 = new JSONObject();
blank4.put("cont", "");
blank4.put("type", "text");
contents.add(blank4);
// 详情
JSONObject detail = new JSONObject();
// 详情table标题
Map<String,Object> thead = new LinkedHashMap<>();
thead.put("油号", "20%");
thead.put("金额(元)", "40%");
thead.put("升数", "25%");
thead.put("笔数", "15%");
detail.put("thead", thead);
JSONArray tbody = new JSONArray();
for (GasClassGroupTaskOilCount oilCount : dataCount.getGroupTaskOilCountList()) {
tbody.add(Stream.of(oilCount.getOilNo()+"#",oilCount.getRefuelPrice(),oilCount.getRefuelLiters(),oilCount.getRefuelNum()).collect(Collectors.toList()));
}
// 详情内容
detail.put("tbody", tbody);
System.out.println(detail.toJSONString());
contents.add(detail);
// 分割线
JSONObject divLine2 = new JSONObject();
divLine2.put("cont", "");
divLine2.put("type", "div_star");
contents.add(divLine2);
// 打印时间
JSONObject printTime = new JSONObject();
printTime.put("cont", DateUtil.date2String(new Date(), DateUtil.Y_M_D_HMS));
printTime.put("type", "text");
printTime.put("align", "center");
contents.add(printTime);
// 切刀
JSONObject cut = new JSONObject();
cut.put("cont", "1");
cut.put("type", "cut");
contents.add(cut);
return contents;
}
/**
* 加油小票
* @param stubType 存根类型 1收银员存根 2客户存根
* @param gasOrder 加油订单
* @param makeUp 是否补打 true: flase:
* @return
*/
public static JSONArray oilReceipt(Integer stubType, BsGasOrder gasOrder, Map<String, Object> receiptMap, boolean makeUp) {
JSONArray contents = new JSONArray();
// 标题
JSONObject title = new JSONObject();
title.put("cont", (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptTop"))?MapUtils.getString(receiptMap, "receiptTop"):"嗨加油"));
title.put("type", "title");
contents.add(title);
// 油站名称
JSONObject merName = new JSONObject();
merName.put("cont", gasOrder.getMerName() + (makeUp?"(补打)":""));
merName.put("type", "text");
merName.put("align", "center");
merName.put("bold", true);
contents.add(merName);
// 存根
JSONObject stub = new JSONObject();
stub.put("cont", stubType==1?"(收银员存根)":"(客户存根)");
stub.put("type", "text");
stub.put("align", "center");
contents.add(stub);
// 分割线
JSONObject divLine1 = new JSONObject();
divLine1.put("cont", "");
divLine1.put("type", "div_star");
contents.add(divLine1);
// 订单号
JSONObject orderNo = new JSONObject();
orderNo.put("cont", "流水:" + gasOrder.getOrderNo());
orderNo.put("type", "text");
contents.add(orderNo);
// 分割线
JSONObject divLine2 = new JSONObject();
divLine2.put("cont", "");
divLine2.put("type", "div_star");
contents.add(divLine2);
// 打印时间
JSONObject printTime = new JSONObject();
printTime.put("cont", "打印时间:" + DateUtil.date2String(new Date(), DateUtil.Y_M_D_HMS));
printTime.put("type", "text");
contents.add(printTime);
// 支付时间
JSONObject payTime = new JSONObject();
payTime.put("cont", "支付时间:" + DateUtil.date2String(gasOrder.getPayTime(), DateUtil.Y_M_D_HMS));
payTime.put("type", "text");
contents.add(payTime);
// 电话
JSONObject userPhone = new JSONObject();
userPhone.put("cont", "电话:" + (StringUtils.isNotBlank(gasOrder.getUserPhone())?gasOrder.getUserPhone().substring(0, 3) + "****" + gasOrder.getUserPhone().substring(7):""));
userPhone.put("type", "text");
contents.add(userPhone);
// 来源
JSONObject source = new JSONObject();
source.put("cont", "来源:" + (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptSource"))?MapUtils.getString(receiptMap, "receiptSource"):"嗨加油"));
source.put("type", "text");
contents.add(source);
// 枪号
JSONObject gunNo = new JSONObject();
gunNo.put("cont", "油枪:" + gasOrder.getGasGunNo()+"号");
gunNo.put("type", "text");
contents.add(gunNo);
// 油品
JSONObject oilNo = new JSONObject();
oilNo.put("cont", "油品:" + gasOrder.getGasOilNo()+"#");
oilNo.put("type", "text");
contents.add(oilNo);
// 升数
JSONObject oilLiters = new JSONObject();
oilLiters.put("cont", "升数:" + gasOrder.getGasOilLiters()+"升");
oilLiters.put("type", "text");
contents.add(oilLiters);
// 升数描述
JSONObject oilLitersDesc = new JSONObject();
oilLitersDesc.put("cont", "实际加油升数以油站加油机为准!");
oilLitersDesc.put("type", "text");
contents.add(oilLitersDesc);
// 分割线
JSONObject divLine3 = new JSONObject();
divLine3.put("cont", "");
divLine3.put("type", "div_star");
contents.add(divLine3);
// 加油金额标题
JSONObject refuelPriceTitle = new JSONObject();
refuelPriceTitle.put("cont", "加油金额");
refuelPriceTitle.put("type", "text");
refuelPriceTitle.put("size", "11");
contents.add(refuelPriceTitle);
// 加油金额
JSONObject refuelPrice = new JSONObject();
refuelPrice.put("cont", "¥" + gasOrder.getGasRefuelPrice() + "元");
refuelPrice.put("type", "text");
refuelPrice.put("size", "11");
contents.add(refuelPrice);
// 分割线
JSONObject divLine4 = new JSONObject();
divLine4.put("cont", "");
divLine4.put("type", "div_star");
contents.add(divLine4);
// 小票底部
JSONObject receiptBottom = new JSONObject();
receiptBottom.put("cont", (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptBottom"))?MapUtils.getString(receiptMap, "receiptBottom"):"开心又省钱; 来"嗨加油""));
receiptBottom.put("type", "text");
receiptBottom.put("align", "center");
contents.add(receiptBottom);
JSONObject cut = new JSONObject();
cut.put("cont", "1");
cut.put("type", "cut");
contents.add(cut);
return contents;
}
}

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.hfkj.device.spyun;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpEntity;

@ -1,4 +1,4 @@
package com.hfkj.config;
package com.hfkj.device.spyun;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.model.GasClassGroupTaskDataCount;
@ -18,7 +18,7 @@ public class SpPrinterTemplate {
/**
* 加油站收银员存根模板
*/
public static String classGroupCountTemp(GasClassGroupTaskDataCount dataCount, boolean makeUp) throws Exception {
public static String classGroupCountTemp(GasClassGroupTaskDataCount dataCount, boolean makeUp) {
String str = "<C>" + dataCount.getClassNum() + "班结流水" + (makeUp?"(补打)":"") + "</C> <BR> " +
"===============================<BR>" +
"开始时间:" + DateUtil.date2String(dataCount.getStartTime(), "yyyy-MM-dd HH:mm:ss") + "<BR>" +
@ -67,7 +67,7 @@ public class SpPrinterTemplate {
String oilLiters,
String orderPrice,
Map<String, Object> receiptMap,
boolean makeUp) throws Exception {
boolean makeUp) {
String str = "<C><L1>" + (StringUtils.isNotBlank(MapUtils.getString(receiptMap, "receiptTop"))?MapUtils.getString(receiptMap, "receiptTop"):"嗨加油") + "</L1></C> <BR> " +
"<C><B>" + gasName + (makeUp?"(补打)":"") + "</B></C> <BR> " +

@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.config.SpPrinterConfig;
import com.hfkj.config.SpPrinterTemplate;
import com.hfkj.config.MqttProviderConfig;
import com.hfkj.device.sanmisen.PrinterTemplate;
import com.hfkj.device.spyun.SpPrinterConfig;
import com.hfkj.device.spyun.SpPrinterTemplate;
import com.hfkj.dao.BsGasClassGroupTaskMapper;
import com.hfkj.entity.*;
import com.hfkj.model.GasClassGroupTaskDataCount;
@ -40,9 +42,8 @@ public class BsGasClassGroupTaskServiceImpl implements BsGasClassGroupTaskServic
@Resource
private BsDeviceService deviceService;
/* @Resource
private MqttProviderConfig mqttProviderConfig;*/
@Resource
private MqttProviderConfig mqttProviderConfig;
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@ -107,6 +108,20 @@ public class BsGasClassGroupTaskServiceImpl implements BsGasClassGroupTaskServic
e.printStackTrace();
}
}).start();
} else if (device.getType().equals(DeviceTypeEnum.type2.getType())) {
new Thread(() -> {
try {
JSONObject publishParam = new JSONObject();
publishParam.put("id", System.currentTimeMillis());
publishParam.put("type", 5);
publishParam.put("vType", 0);
publishParam.put("vMessage", "班结数据汇总,请注意查收");
publishParam.put("contents", PrinterTemplate.classGroupCountTemp(dataCount ,false));
mqttProviderConfig.publish(1, false, device.getDeviceSn()+"/submsg", publishParam.toJSONString());
} catch (Exception e) {
e.printStackTrace();
}
}).start();
}
}
}

@ -1,8 +1,11 @@
package com.hfkj.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.config.SpPrinterConfig;
import com.hfkj.config.SpPrinterTemplate;
import com.hfkj.config.MqttProviderConfig;
import com.hfkj.device.sanmisen.PrinterTemplate;
import com.hfkj.device.spyun.SpPrinterConfig;
import com.hfkj.device.spyun.SpPrinterTemplate;
import com.hfkj.dao.BsDeviceMapper;
import com.hfkj.entity.BsDevice;
import com.hfkj.entity.BsDeviceExample;
@ -25,7 +28,8 @@ public class BsDeviceServiceImpl implements BsDeviceService {
@Resource
private BsDeviceMapper deviceMapper;
@Resource
private MqttProviderConfig mqttProviderConfig;
@Override
public void editDevice(BsDevice device) {
if (device.getId() == null) {
@ -127,8 +131,47 @@ public class BsDeviceServiceImpl implements BsDeviceService {
makeUp
), 1);
}
} catch (Exception e) {
e.printStackTrace();
}
}).start();
} else if (device.getType().equals(DeviceTypeEnum.type2.getType())) {
new Thread(() -> {
try {
JSONObject param = new JSONObject();
if (device.getReceiptOutContent().equals(DeviceReceiptOutContentEnum.content1.getType())
|| device.getReceiptOutContent().equals(DeviceReceiptOutContentEnum.content2.getType())) {
param.put("id", System.currentTimeMillis());
param.put("type", 5);
if (!makeUp) {
param.put("vType", 0);
param.put("vMessage", "嗨加油新订单,加油金额"+gasOrder.getGasRefuelPrice()+"元,请注意查收");
} else {
param.put("vType", 0);
param.put("vMessage", "补打加油小票,请注意查收");
}
param.put("contents", PrinterTemplate.oilReceipt(1, gasOrder , receiptMap, makeUp));
mqttProviderConfig.publish(1, false, device.getDeviceSn()+"/submsg", param.toJSONString());
}
if (device.getReceiptOutContent().equals(DeviceReceiptOutContentEnum.content1.getType())
|| device.getReceiptOutContent().equals(DeviceReceiptOutContentEnum.content3.getType())) {
param.clear();
param.put("id", System.currentTimeMillis());
param.put("type", 5);
if (!device.getReceiptOutContent().equals(DeviceReceiptOutContentEnum.content1.getType())) {
if (!makeUp) {
param.put("vType", 0);
param.put("vMessage", "嗨加油新订单,加油金额"+gasOrder.getGasRefuelPrice()+"元,请注意查收");
} else {
param.put("vType", 0);
param.put("vMessage", "补打加油小票,请注意查收");
}
}
param.put("contents", PrinterTemplate.oilReceipt(2, gasOrder , receiptMap, makeUp));
mqttProviderConfig.publish(1, false, device.getDeviceSn()+"/submsg", param.toJSONString());
}
} catch (Exception e) {
e.printStackTrace();

@ -8,6 +8,7 @@ import java.util.Objects;
*/
public enum DeviceTypeEnum {
type1(1 , "商鹏云打印"),
type2(2 , "三木森云打印"),
;
private Integer type;

Loading…
Cancel
Save