diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/GoodsNameController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/GoodsNameController.java index 4fd8e9019..bd0a79c95 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/GoodsNameController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/GoodsNameController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.weight.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -122,9 +123,10 @@ public class GoodsNameController { * @return */ @ApiOperation(value = "删除货名信息", notes = "删除货名信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "货名ID", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); Result result = new Result(); GoodsName goodsName = goodsNameService.getById(id); if (goodsName == null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/ReceivingForwardingUnitController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/ReceivingForwardingUnitController.java index 1d5d7678f..8eb27fb90 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/ReceivingForwardingUnitController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/ReceivingForwardingUnitController.java @@ -1,6 +1,8 @@ package com.zhgd.xmgl.modules.weight.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -122,9 +124,10 @@ public class ReceivingForwardingUnitController { * @return */ @ApiOperation(value = "删除收发货单位信息", notes = "删除收发货单位信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "收发货单位ID", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); Result result = new Result(); ReceivingForwardingUnit receivingForwardingUnit = receivingForwardingUnitService.getById(id); if (receivingForwardingUnit == null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java index 1c0000fd5..8bef96674 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java @@ -1,47 +1,50 @@ package com.zhgd.xmgl.modules.weight.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; +import com.zhgd.xmgl.modules.weight.enums.WeighingTypeEnum; import com.zhgd.xmgl.modules.weight.service.IWeighBookVehicleInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; - /** +/** * @Title: Controller * @Description: 过磅预约车辆信息 * @author： pds - * @date： 2023-03-21 + * @date： 2023-03-21 * @version： V1.0 */ @RestController @@ -51,23 +54,26 @@ import com.alibaba.fastjson.JSON; public class WeighBookVehicleInfoController { @Autowired private IWeighBookVehicleInfoService weighBookVehicleInfoService; - + /** - * 分页列表查询 + * 分页列表查询 + * * @param weighBookVehicleInfo * @param pageNo * @param pageSize + * @param lastAdddatetime 现场上次拉取的时间 * @param req * @return */ - @ApiOperation(value = " 分页列表查询过磅预约车辆信息信息", notes = "分页列表查询过磅预约车辆信息信息", httpMethod="GET") + @ApiOperation(value = " 分页列表查询过磅预约车辆信息信息", notes = "分页列表查询过磅预约车辆信息信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String lastAdddatetime, HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(weighBookVehicleInfo, req.getParameterMap()); + if (StringUtils.isNotBlank(lastAdddatetime)) { + DateTime dateTime = DateUtil.parse(lastAdddatetime); + queryWrapper.lambda().ge(WeighBookVehicleInfo::getAddDateTime, dateTime); + } Page page = new Page(pageNo, pageSize); IPage pageList = weighBookVehicleInfoService.page(page, queryWrapper); result.setSuccess(true); @@ -105,41 +111,43 @@ public class WeighBookVehicleInfoController { public Result edit(@RequestBody WeighBookVehicleInfo weighBookVehicleInfo) { Result result = new Result(); WeighBookVehicleInfo weighBookVehicleInfoEntity = weighBookVehicleInfoService.getById(weighBookVehicleInfo.getId()); - if(weighBookVehicleInfoEntity==null) { + if (weighBookVehicleInfoEntity == null) { result.error500("未找到对应实体"); - }else { - weighBookVehicleInfoService.updateById(weighBookVehicleInfo); - result.success("修改成功!"); + } else { + weighBookVehicleInfoService.updateById(weighBookVehicleInfo); + result.success("修改成功!"); } - + return result; } - + /** - * 通过id删除 + * 通过id删除 + * * @param id * @return */ - @ApiOperation(value = "删除过磅预约车辆信息信息", notes = "删除过磅预约车辆信息信息" , httpMethod="POST") - @ApiImplicitParam(name = "id", value = "过磅预约车辆信息ID", paramType = "query", required = true, dataType = "Integer") + @ApiOperation(value = "删除过磅预约车辆信息信息", notes = "删除过磅预约车辆信息信息", httpMethod = "POST") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); Result result = new Result(); WeighBookVehicleInfo weighBookVehicleInfo = weighBookVehicleInfoService.getById(id); - if(weighBookVehicleInfo==null) { + if (weighBookVehicleInfo == null) { result.error500("未找到对应实体"); - }else { + } else { boolean ok = weighBookVehicleInfoService.removeById(id); - if(ok) { + if (ok) { result.success("删除成功!"); } } - + return result; } - + /** - * 批量删除 + * 批量删除 * @param ids * @return */ @@ -220,32 +228,42 @@ public class WeighBookVehicleInfoController { @ApiOperation(value = "通过excel导入过磅预约车辆信息信息", notes = "通过excel导入过磅预约车辆信息信息", httpMethod="POST") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listWeighBookVehicleInfos = ExcelImportUtil.importExcel(file.getInputStream(), WeighBookVehicleInfo.class, params); - for (WeighBookVehicleInfo weighBookVehicleInfoExcel : listWeighBookVehicleInfos) { - weighBookVehicleInfoService.save(weighBookVehicleInfoExcel); - } - return Result.ok("文件导入成功！数据行数：" + listWeighBookVehicleInfos.size()); - } catch (Exception e) { - log.error(e.getMessage()); - return Result.error("文件导入失败！"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Result.ok("文件导入失败！"); - } + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listWeighBookVehicleInfos = ExcelImportUtil.importExcel(file.getInputStream(), WeighBookVehicleInfo.class, params); + for (WeighBookVehicleInfo weighBookVehicleInfoExcel : listWeighBookVehicleInfos) { + weighBookVehicleInfoService.save(weighBookVehicleInfoExcel); + } + return Result.ok("文件导入成功！数据行数：" + listWeighBookVehicleInfos.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } + /** + * 获取所有过磅类型列表 + * + * @return + */ + @GetMapping("/weighingType") + @ApiOperation(value = "获取所有过磅类型列表", notes = "获取所有过磅类型列表", httpMethod = "GET") + public Result> getWeighingTypeEnums() { + return Result.success(Arrays.stream(WeighingTypeEnum.values()).collect(Collectors.toList())); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java index 81c06d962..1caf8849e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.weight.controller; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -120,9 +121,10 @@ public class WeighInfoController { * @return */ @ApiOperation(value = "删除称重记录表信息", notes = "删除称重记录表信息" , httpMethod="POST") - @ApiImplicitParam(name = "id", value = "称重记录表ID", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); Result result = new Result(); WeighInfo weighInfo = weighInfoService.getById(id); if(weighInfo==null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighPicController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighPicController.java index e717b7194..7cd265b53 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighPicController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighPicController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.weight.controller; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -122,9 +123,10 @@ public class WeighPicController { * @return */ @ApiOperation(value = "删除称重图片信息", notes = "删除称重图片信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "称重图片ID", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); Result result = new Result(); WeighPic weighPic = weighPicService.getById(id); if (weighPic == null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/GoodsName.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/GoodsName.java index ce3391c6a..8fa3014ee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/entity/GoodsName.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/GoodsName.java @@ -26,7 +26,7 @@ public class GoodsName implements Serializable { /**主键id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="主键id") - private java.lang.Integer id ; + private java.lang.Long id ; /**货名*/ @Excel(name = "货名", width = 15) @ApiModelProperty(value="货名") diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/ReceivingForwardingUnit.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/ReceivingForwardingUnit.java index 59eab503d..795b4f4db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/entity/ReceivingForwardingUnit.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/ReceivingForwardingUnit.java @@ -26,7 +26,7 @@ public class ReceivingForwardingUnit implements Serializable { /**主键id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="主键id") - private java.lang.Integer id ; + private java.lang.Long id ; /**单位名称*/ @Excel(name = "单位名称", width = 15) @ApiModelProperty(value="单位名称") diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java index cf319fe3f..986fc98ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java @@ -26,7 +26,7 @@ public class WeighBookVehicleInfo implements Serializable { /**主键id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="主键id") - private java.lang.Integer id ; + private java.lang.Long id ; /**车牌号码*/ @Excel(name = "车牌号码", width = 15) @ApiModelProperty(value="车牌号码") diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighInfo.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighInfo.java index 26cd5e391..4dec5a9af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighInfo.java @@ -26,7 +26,7 @@ public class WeighInfo implements Serializable { /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") - private java.lang.Integer id ; + private java.lang.Long id ; /**流水号*/ @Excel(name = "流水号", width = 15) @ApiModelProperty(value="流水号") diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighPic.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighPic.java index 888e9158f..4fe5573e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighPic.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighPic.java @@ -29,7 +29,7 @@ public class WeighPic implements Serializable { */ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键id") - private java.lang.Integer id; + private java.lang.Long id; /** * 称重记录ID */ diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/enums/WeighingTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/weight/enums/WeighingTypeEnum.java new file mode 100644 index 000000000..718a53e34 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/weight/enums/WeighingTypeEnum.java @@ -0,0 +1,38 @@ +package com.zhgd.xmgl.modules.weight.enums; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 过磅类型注解 + */ +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum WeighingTypeEnum { + PURCHASED_OVER_THE_SCALE(1, "采购过磅"), + 销售过磅SOLD_OVER_POUNDS(2, "销售过磅"), + WEIGHED_INSIDE(3, "内部过磅"), + OTHER_OVERWEIGHS(4, "其他过磅"), + ; + private int id; + private String name; + + WeighingTypeEnum(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index da6b0ffbc..07627beef 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -121,9 +121,10 @@ public class ${entityName}Controller { * @return */ @ApiOperation(value = "删除${tableVo.ftlDescription}信息", notes = "删除${tableVo.ftlDescription}信息" , httpMethod="POST") - @ApiImplicitParam(name = "id", value = "${tableVo.ftlDescription}ID", paramType = "query", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result<${entityName}> delete(@RequestParam(name="id",required=true) String id) { + public Result<${entityName}> delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); Result<${entityName}> result = new Result<${entityName}>(); ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); if(${entityName?uncap_first}==null) {