|
|
|
@ -1,35 +1,38 @@
|
|
|
|
|
package jnpf.service.impl;
|
|
|
|
|
|
|
|
|
|
import jnpf.entity.*;
|
|
|
|
|
import jnpf.mapper.RecycleDeviceMapper;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.model.recycledevice.*;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import jnpf.permission.model.authorize.AuthorizeConditionModel;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryJsonModel;
|
|
|
|
|
import jnpf.database.model.superQuery.ConditionJsonModel;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperQueryConditionModel;
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
import cn.hutool.http.HttpRequest;
|
|
|
|
|
import cn.hutool.http.HttpResponse;
|
|
|
|
|
import cn.hutool.http.HttpUtil;
|
|
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
import jnpf.entity.RecycleDeviceEntity;
|
|
|
|
|
import jnpf.mapper.RecycleDeviceMapper;
|
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
|
import jnpf.model.recycledevice.RecycleDeviceConstant;
|
|
|
|
|
import jnpf.model.recycledevice.RecycleDeviceForm;
|
|
|
|
|
import jnpf.model.recycledevice.RecycleDevicePagination;
|
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
import jnpf.service.RecycleDeviceService;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* RecycleDevice
|
|
|
|
@ -46,6 +49,9 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
|
|
|
|
|
@Autowired
|
|
|
|
|
private UserProvider userProvider;
|
|
|
|
|
|
|
|
|
|
@Value("${nxhs.url}")
|
|
|
|
|
private String wx_url;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<RecycleDeviceEntity> getList(RecycleDevicePagination recycleDevicePagination){
|
|
|
|
|
return getTypeList(recycleDevicePagination,recycleDevicePagination.getDataType());
|
|
|
|
@ -292,9 +298,29 @@ public class RecycleDeviceServiceImpl extends ServiceImpl<RecycleDeviceMapper, R
|
|
|
|
|
String mainId = RandomUtil.uuId() ;
|
|
|
|
|
entity.setDeviceCode(generaterSwapUtil.getBillNumber("deviceCode", false));
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
String deviceCode = entity.getDeviceCode();
|
|
|
|
|
String qrCode = generateQRCode(deviceCode);
|
|
|
|
|
entity.setDeviceCodeQr(qrCode);
|
|
|
|
|
}else{
|
|
|
|
|
}
|
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public String generateQRCode(String deviceCode) {
|
|
|
|
|
HashMap<String, Object> param = new HashMap<>();
|
|
|
|
|
param.put("deviceCode",deviceCode);
|
|
|
|
|
param.put("page","");
|
|
|
|
|
HttpResponse response = HttpRequest.post(wx_url + "/api/wx/generateDeviceQRCode")
|
|
|
|
|
.header("Content-Type", "application/json")
|
|
|
|
|
.body(JSONUtil.toJsonStr(param))
|
|
|
|
|
.timeout(1000)
|
|
|
|
|
.execute();
|
|
|
|
|
String body = response.body();
|
|
|
|
|
JSONObject result = JSONUtil.parseObj(body);
|
|
|
|
|
String data = result.getStr("data");
|
|
|
|
|
return data;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|