Update VehicleServiceImpl.java

This commit is contained in:
张江玮
2022-12-14 12:25:55 +08:00
parent ca381c246f
commit 66e4cba196

View File

@@ -32,30 +32,30 @@ import lombok.extern.slf4j.Slf4j;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
/** /**
* @description 服务实现 * @author lyd
* @author lyd * @description 服务实现
* @date 2022-10-18 * @date 2022-10-18
**/ **/
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class VehicleServiceImpl implements VehicleService { public class VehicleServiceImpl implements VehicleService {
@Override @Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){ public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code"); String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code");
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("flag", "1"); map.put("flag", "1");
map.put("vehicle_type", MapUtil.getStr(whereJson, "vehicle_type")); map.put("vehicle_type", MapUtil.getStr(whereJson, "vehicle_type"));
if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%"); if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", "%" + vehicle_code + "%");
JSONObject json = WQL.getWO("QMD_PB_VEHICLE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); JSONObject json = WQL.getWO("QMD_PB_VEHICLE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
return json; return json;
} }
@Override @Override
public List<VehicleDto> queryAll(Map whereJson){ public List<VehicleDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
JSONArray arr = wo.query().getResultJSONArray(0); JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(VehicleDto.class); if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(VehicleDto.class);
@@ -66,18 +66,18 @@ public class VehicleServiceImpl implements VehicleService {
public VehicleDto findById(Long vehicle_id) { public VehicleDto findById(Long vehicle_id) {
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
JSONObject json = wo.query("vehicle_id = '" + vehicle_id + "'").uniqueResult(0); JSONObject json = wo.query("vehicle_id = '" + vehicle_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){ if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject( VehicleDto.class); return json.toJavaObject(VehicleDto.class);
} }
return null; return null;
} }
@Override @Override
public VehicleDto findByCode(String code) { public VehicleDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
JSONObject json = wo.query("vehicle_code ='" + code + "'").uniqueResult(0); JSONObject json = wo.query("vehicle_code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){ if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject( VehicleDto.class); return json.toJavaObject(VehicleDto.class);
} }
return null; return null;
} }
@@ -95,21 +95,18 @@ public class VehicleServiceImpl implements VehicleService {
String vehicle_type = WhereJson.getString("vehicle_type"); String vehicle_type = WhereJson.getString("vehicle_type");
JSONArray resultCodeArr = new JSONArray(); JSONArray resultCodeArr = new JSONArray();
int num = WhereJson.getIntValue("num"); VehicleDto dto = new VehicleDto();
for (int i = 0; i < num; i++) { dto.setVehicle_id(IdUtil.getSnowflake(1, 1).nextId());
VehicleDto dto = new VehicleDto(); dto.setVehicle_code(WhereJson.getString("vehicle_code"));
dto.setVehicle_id(IdUtil.getSnowflake(1,1).nextId()); dto.setVehicle_name(dto.getVehicle_code());
dto.setVehicle_code(WhereJson.getString("vehicle_code")); dto.setVehicle_type(vehicle_type);
dto.setVehicle_name(dto.getVehicle_code()); dto.setCreate_id(currentUserId);
dto.setVehicle_type(vehicle_type); dto.setCreate_name(nickName);
dto.setCreate_id(currentUserId); dto.setCreate_time(now);
dto.setCreate_name(nickName);
dto.setCreate_time(now);
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json); wo.insert(json);
resultCodeArr.add(dto.getVehicle_code()); resultCodeArr.add(dto.getVehicle_code());
}
return resultCodeArr; return resultCodeArr;
} }
@@ -140,7 +137,7 @@ public class VehicleServiceImpl implements VehicleService {
String now = DateUtil.now(); String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
for (Long vehicle_id: ids) { for (Long vehicle_id : ids) {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("vehicle_id", String.valueOf(vehicle_id)); param.put("vehicle_id", String.valueOf(vehicle_id));
param.put("is_delete", "1"); param.put("is_delete", "1");