diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java index af0a681..3a49bae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java @@ -32,30 +32,30 @@ import lombok.extern.slf4j.Slf4j; import cn.hutool.core.util.ObjectUtil; /** -* @description 服务实现 -* @author lyd -* @date 2022-10-18 -**/ + * @author lyd + * @description 服务实现 + * @date 2022-10-18 + **/ @Service @RequiredArgsConstructor @Slf4j public class VehicleServiceImpl implements VehicleService { @Override - public Map queryAll(Map whereJson, Pageable page){ + public Map queryAll(Map whereJson, Pageable page) { String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code"); JSONObject map = new JSONObject(); map.put("flag", "1"); 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"); return json; } @Override - public List queryAll(Map whereJson){ + public List queryAll(Map whereJson) { WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); JSONArray arr = wo.query().getResultJSONArray(0); if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(VehicleDto.class); @@ -66,18 +66,18 @@ public class VehicleServiceImpl implements VehicleService { public VehicleDto findById(Long vehicle_id) { WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); JSONObject json = wo.query("vehicle_id = '" + vehicle_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( VehicleDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(VehicleDto.class); } return null; } @Override - public VehicleDto findByCode(String code) { + public VehicleDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); JSONObject json = wo.query("vehicle_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( VehicleDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(VehicleDto.class); } return null; } @@ -95,21 +95,18 @@ public class VehicleServiceImpl implements VehicleService { String vehicle_type = WhereJson.getString("vehicle_type"); JSONArray resultCodeArr = new JSONArray(); - int num = WhereJson.getIntValue("num"); - for (int i = 0; i < num; i++) { - VehicleDto dto = new VehicleDto(); - dto.setVehicle_id(IdUtil.getSnowflake(1,1).nextId()); - dto.setVehicle_code(WhereJson.getString("vehicle_code")); - dto.setVehicle_name(dto.getVehicle_code()); - dto.setVehicle_type(vehicle_type); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setCreate_time(now); + VehicleDto dto = new VehicleDto(); + dto.setVehicle_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setVehicle_code(WhereJson.getString("vehicle_code")); + dto.setVehicle_name(dto.getVehicle_code()); + dto.setVehicle_type(vehicle_type); + dto.setCreate_id(currentUserId); + dto.setCreate_name(nickName); + dto.setCreate_time(now); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - resultCodeArr.add(dto.getVehicle_code()); - } + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); + resultCodeArr.add(dto.getVehicle_code()); return resultCodeArr; } @@ -140,7 +137,7 @@ public class VehicleServiceImpl implements VehicleService { String now = DateUtil.now(); WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); - for (Long vehicle_id: ids) { + for (Long vehicle_id : ids) { JSONObject param = new JSONObject(); param.put("vehicle_id", String.valueOf(vehicle_id)); param.put("is_delete", "1");