|
@@ -19,6 +19,7 @@ import com.szwl.model.bean.*;
|
|
import com.szwl.model.bo.JsonUtils;
|
|
import com.szwl.model.bo.JsonUtils;
|
|
import com.szwl.model.bo.R;
|
|
import com.szwl.model.bo.R;
|
|
import com.szwl.model.bo.ResponseModel;
|
|
import com.szwl.model.bo.ResponseModel;
|
|
|
|
+import com.szwl.model.dto.ReturnCoinVo;
|
|
import com.szwl.model.entity.*;
|
|
import com.szwl.model.entity.*;
|
|
import com.szwl.model.utils.AdminUtils;
|
|
import com.szwl.model.utils.AdminUtils;
|
|
import com.szwl.model.utils.HttpClientSslUtils;
|
|
import com.szwl.model.utils.HttpClientSslUtils;
|
|
@@ -30,7 +31,6 @@ import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
-import org.springframework.amqp.core.AmqpAdmin;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -91,9 +91,6 @@ public class IndexController {
|
|
TNameDictionaryService nameDictionaryService;
|
|
TNameDictionaryService nameDictionaryService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private AmqpAdmin amqpAdmin;
|
|
|
|
-
|
|
|
|
- @Autowired
|
|
|
|
TWechatService wechatService;
|
|
TWechatService wechatService;
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
@@ -105,6 +102,9 @@ public class IndexController {
|
|
@Autowired
|
|
@Autowired
|
|
TAlarmRecordService alarmRecordService;
|
|
TAlarmRecordService alarmRecordService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ ReturnCoinRecordService returnCoinRecordService;
|
|
|
|
+
|
|
private static final String appid = "07784f5fedb508046c841b391005b7de";
|
|
private static final String appid = "07784f5fedb508046c841b391005b7de";
|
|
|
|
|
|
@ApiOperation(value = "心跳")
|
|
@ApiOperation(value = "心跳")
|
|
@@ -586,10 +586,7 @@ public class IndexController {
|
|
LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
|
|
queryProduct.eq(TProduct::getEquipmentId, equipment.getId());
|
|
queryProduct.eq(TProduct::getEquipmentId, equipment.getId());
|
|
List<TProduct> productList = productService.list(queryProduct);
|
|
List<TProduct> productList = productService.list(queryProduct);
|
|
- if (productList.size() == 0) {
|
|
|
|
-// for (TProduct product : productList) {
|
|
|
|
-// productService.removeById(product.getId());
|
|
|
|
-// }
|
|
|
|
|
|
+ if (productList.isEmpty()) {
|
|
if (StringUtils.isEmpty(machineType) || machineType.equals("0")) {
|
|
if (StringUtils.isEmpty(machineType) || machineType.equals("0")) {
|
|
if (equipmentApply.getEquimentType() != null && equipmentApply.getEquimentType().equals("MG280")) {
|
|
if (equipmentApply.getEquimentType() != null && equipmentApply.getEquimentType().equals("MG280")) {
|
|
saveProductMG280(equipmentId);
|
|
saveProductMG280(equipmentId);
|
|
@@ -2415,5 +2412,15 @@ public class IndexController {
|
|
return "找不到设备";
|
|
return "找不到设备";
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ApiOperation("上传远程退币状态")
|
|
|
|
+ @PostMapping("/uploadReturnCoinStatus")
|
|
|
|
+ public String uploadReturnCoinStatus(@RequestBody ReturnCoinVo returnCoinVo) {
|
|
|
|
+ Long id = returnCoinVo.getId();
|
|
|
|
+ ReturnCoinRecord returnCoinRecord = returnCoinRecordService.getById(id);
|
|
|
|
+ returnCoinRecord.setStatus(returnCoinVo.getStatus());
|
|
|
|
+ returnCoinRecord.setReason(returnCoinVo.getReason());
|
|
|
|
+ returnCoinRecordService.updateById(returnCoinRecord);
|
|
|
|
+ return "success";
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|