From efae873723e4a9c6346fa307782c7f6b364e84d4 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Wed, 10 May 2023 14:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B1=9Fbug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E5=85=A8=E8=B5=84=E6=96=99bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/ExceptionHandlerAdvice.java | 34 +++++++++ .../common/system/query/QueryGenerator.java | 9 ++- .../GtMaterialAcceptanceCheckController.java | 18 ++--- .../GtMaterialArticleController.java | 8 ++- ...terialPartyBuildingActivityController.java | 18 ++--- .../GtMaterialPartyMemberController.java | 18 ++--- .../GtMaterialSampleTestController.java | 18 ++--- ...GtMaterialSendReceiveSampleController.java | 18 ++--- ...tMaterialTestingInstitutionController.java | 18 ++--- .../GtMaterialWitnessSampleController.java | 4 +- .../entity/SjSafeEnvironmentFile.java | 3 + .../mapper/SjSafeEnvironmentFileMapper.java | 3 + .../xml/SjSafeEnvironmentFileMapper.xml | 25 +++++++ .../SjSafeEnvironmentFileServiceImpl.java | 25 ++++--- .../xmgl/modules/weight/entity/GoodsName.java | 38 ++++++---- .../weight/entity/WeighBookVehicleInfo.java | 13 ++-- .../mapper/WeighBookVehicleInfoMapper.java | 7 +- .../mapper/xml/WeighBookVehicleInfoMapper.xml | 9 ++- .../impl/WeighBookVehicleInfoServiceImpl.java | 27 ++++--- .../mapper/xml/DepartmentInfoMapper.xml | 28 +++++--- .../com/zhgd/xmgl/pdf/MyHeaderFooter2.java | 14 ++-- .../application-other-env-show.properties | 71 +++++++++++++++++++ src/main/resources/application.properties | 6 +- 23 files changed, 315 insertions(+), 117 deletions(-) create mode 100644 src/main/resources/application-other-env-show.properties diff --git a/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java b/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java index 11f273bf2..7226bafe9 100644 --- a/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java +++ b/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java @@ -1,14 +1,24 @@ package com.zhgd.exception; +import cn.hutool.core.util.StrUtil; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.constant.CommonConstant; import com.zhgd.jeecg.common.execption.OpenAlertException; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @program: itbgpproject @@ -43,4 +53,28 @@ public class ExceptionHandlerAdvice { log.error("errr：", ex); return result; } + + /** + * Bean校验友好返回信息 + * + * @param e + * @return + */ + @ExceptionHandler(value = MethodArgumentNotValidException.class) + @ResponseBody + public Result handleVaildException(MethodArgumentNotValidException e) { + log.error("数据校验出现问题{}，异常类型：{}", e.getMessage(), e.getClass()); + BindingResult bindingResult = e.getBindingResult(); + + Map errorMap = new HashMap<>(); + bindingResult.getFieldErrors().forEach((fieldError) -> { + errorMap.put(fieldError.getField(), fieldError.getDefaultMessage()); + }); + List messageList = bindingResult.getFieldErrors().stream().map(FieldError::getDefaultMessage).collect(Collectors.toList()); + Result r = new Result<>(); + r.setCode(CommonConstant.SC_INTERNAL_SERVER_ERROR_500); + r.setMessage(StrUtil.format("请输入合理的数据：{}", StringUtils.join(messageList))); + r.setResult(errorMap); + return r; + } } diff --git a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java index e2f9f2419..b8cb92fa7 100644 --- a/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java +++ b/src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java @@ -83,7 +83,14 @@ public class QueryGenerator { return initQueryWrapper(searchObj, parameterMap, excludeFields, null, false); } - + /** + * @param searchObj + * @param parameterMap + * @param excludeFields + * @param likeFields like属性（eg：ReflectionUtil.getFieldNameList) + * @param + * @return + */ public static QueryWrapper initQueryWrapper(T searchObj, Map parameterMap, List excludeFields, List likeFields) { return initQueryWrapper(searchObj, parameterMap, excludeFields, likeFields, false, null); } diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialAcceptanceCheckController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialAcceptanceCheckController.java index d122eee0a..790ff0a8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialAcceptanceCheckController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialAcceptanceCheckController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialAcceptanceCheck; import com.zhgd.xmgl.modules.gt.service.IGtMaterialAcceptanceCheckService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -65,14 +66,15 @@ public class GtMaterialAcceptanceCheckController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialAcceptanceCheck, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialAcceptanceCheckService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialAcceptanceCheck, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialAcceptanceCheck::getItemName)); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialAcceptanceCheckService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** * 列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialArticleController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialArticleController.java index 7f53d37bd..2c625bdcf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialArticleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialArticleController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialArticle; import com.zhgd.xmgl.modules.gt.service.IGtMaterialArticleService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -85,9 +86,10 @@ public class GtMaterialArticleController { public Result> queryList(GtMaterialArticle gtMaterialArticle, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialArticle, req.getParameterMap()); - return Result.success(gtMaterialArticleService.list(queryWrapper)); - } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialArticle, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialArticle::getArticleTitle)); + return Result.success(gtMaterialArticleService.list(queryWrapper)); + } /** * 添加 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyBuildingActivityController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyBuildingActivityController.java index 55f7ad891..5f099d3e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyBuildingActivityController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyBuildingActivityController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialPartyBuildingActivity; import com.zhgd.xmgl.modules.gt.service.IGtMaterialPartyBuildingActivityService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -65,14 +66,15 @@ public class GtMaterialPartyBuildingActivityController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPartyBuildingActivity, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialPartyBuildingActivityService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPartyBuildingActivity, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialPartyBuildingActivity::getActivityTheme)); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialPartyBuildingActivityService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** * 列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyMemberController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyMemberController.java index d3580f768..cae6af317 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyMemberController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPartyMemberController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialPartyMember; import com.zhgd.xmgl.modules.gt.service.IGtMaterialPartyMemberService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -64,14 +65,15 @@ public class GtMaterialPartyMemberController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPartyMember, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialPartyMemberService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPartyMember, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialPartyMember::getUnitName)); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialPartyMemberService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** * 列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSampleTestController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSampleTestController.java index f75994c66..bcd6b785c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSampleTestController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSampleTestController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialSampleTest; import com.zhgd.xmgl.modules.gt.service.IGtMaterialSampleTestService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -65,14 +66,15 @@ public class GtMaterialSampleTestController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSampleTest, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialSampleTestService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSampleTest, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialSampleTest::getProjectName, GtMaterialSampleTest::getSampleName)); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialSampleTestService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** * 列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSendReceiveSampleController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSendReceiveSampleController.java index f4577f65d..f864d91ea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSendReceiveSampleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSendReceiveSampleController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialSendReceiveSample; import com.zhgd.xmgl.modules.gt.service.IGtMaterialSendReceiveSampleService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -65,14 +66,15 @@ public class GtMaterialSendReceiveSampleController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSendReceiveSample, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialSendReceiveSampleService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSendReceiveSample, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialSendReceiveSample::getProjectName, GtMaterialSendReceiveSample::getSampleName)); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialSendReceiveSampleService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** * 列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTestingInstitutionController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTestingInstitutionController.java index 017c69604..1d76a41a8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTestingInstitutionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTestingInstitutionController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialTestingInstitution; import com.zhgd.xmgl.modules.gt.service.IGtMaterialTestingInstitutionService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -65,14 +66,15 @@ public class GtMaterialTestingInstitutionController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTestingInstitution, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = gtMaterialTestingInstitutionService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTestingInstitution, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialTestingInstitution::getInstitutionName)); + Page page = new Page(pageNo, pageSize); + IPage pageList = gtMaterialTestingInstitutionService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** * 列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialWitnessSampleController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialWitnessSampleController.java index 3a566556f..cd3924591 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialWitnessSampleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialWitnessSampleController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.gt.entity.GtMaterialWitnessSample; import com.zhgd.xmgl.modules.gt.service.IGtMaterialWitnessSampleService; +import com.zhgd.xmgl.util.ReflectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -66,7 +67,8 @@ public class GtMaterialWitnessSampleController { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialWitnessSample, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialWitnessSample, req.getParameterMap(), null, + ReflectionUtil.getFieldNameList(GtMaterialWitnessSample::getProjectName, GtMaterialWitnessSample::getSampleName)); Page page = new Page(pageNo, pageSize); IPage pageList = gtMaterialWitnessSampleService.page(page, queryWrapper); result.setSuccess(true); diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java index 717f5c73b..a97cf9aa9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjSafeEnvironmentFile.java @@ -79,6 +79,9 @@ public class SjSafeEnvironmentFile implements Serializable { @ApiModelProperty(value = "三江安全环保资料中心文件类型id") private Long sjSafeEnvironmentFileTypeId; + @ApiModelProperty(value = "每次上传文件唯一值") + private String uploadStamp; + @ApiModelProperty(value = "项目SN或企业sn") @TableField(exist = false) private java.lang.String sn; diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java index b4273e25e..9fd2e54e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjSafeEnvironmentFileMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 三江安全环保资料中心 @@ -25,4 +26,6 @@ public interface SjSafeEnvironmentFileMapper extends BaseMapper projectSnList); void updateFilepathByPathAndName(SjSafeEnvironmentFile sjSafeEnvironmentFile); + + List getFileList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjSafeEnvironmentFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjSafeEnvironmentFileMapper.xml index 01bf6bb36..8bf6efa09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjSafeEnvironmentFileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjSafeEnvironmentFileMapper.xml @@ -33,4 +33,29 @@ UPDATE sj_safe_environment_file SET file_path=#{filePath} WHERE file_id=#{fileId} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java index e0d1f5c99..6a7c755f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjSafeEnvironmentFileServiceImpl.java @@ -98,8 +98,8 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl() .in(SjSafeEnvironmentFile::getProjectSn, projectSnList) - .eq(SjSafeEnvironmentFile::getFilePath, sjSafeEnvironmentFile.getFilePath()) - .eq(SjSafeEnvironmentFile::getFileName, sjSafeEnvironmentFile.getFileName()) + .eq(SjSafeEnvironmentFile::getFilePath, oldSjSafeEnvironmentFile.getFilePath()) + .eq(SjSafeEnvironmentFile::getFileName, oldSjSafeEnvironmentFile.getFileName()) ); sjSafeEnvironmentFileMapper.replaceProjectFilePathAndProjectSnList(oldSjSafeEnvironmentFile.getFilePath() + sjSafeEnvironmentFile.getFileName() + "/", oldSjSafeEnvironmentFile.getFilePath() + oldSjSafeEnvironmentFile.getFileName() + "/", projectSnList); @@ -138,10 +138,14 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().in(SjSafeEnvironmentFile::getProjectSn, projectSnList) - .likeRight(SjSafeEnvironmentFile::getFilePath, filePath); - sjSafeEnvironmentFileMapper.delete(queryWrapper); + //删除下级 + sjSafeEnvironmentFileMapper.delete(new LambdaQueryWrapper().in(SjSafeEnvironmentFile::getProjectSn, projectSnList) + .likeRight(SjSafeEnvironmentFile::getFilePath, filePath)); + //删除自己这个目录 + sjSafeEnvironmentFileMapper.delete(new LambdaQueryWrapper().in(SjSafeEnvironmentFile::getProjectSn, projectSnList) + .eq(SjSafeEnvironmentFile::getFilePath, oldSjSafeEnvironmentFile.getFilePath()) + .eq(SjSafeEnvironmentFile::getFileName, oldSjSafeEnvironmentFile.getFileName()) + ); } else { sjSafeEnvironmentFileMapper.delete(new LambdaQueryWrapper().in(SjSafeEnvironmentFile::getProjectSn, projectSnList) .eq(SjSafeEnvironmentFile::getFileUrl, oldSjSafeEnvironmentFile.getFileUrl())); @@ -202,13 +206,8 @@ public class SjSafeEnvironmentFileServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda() - .in(SjSafeEnvironmentFile::getProjectSn, projectSnList) - .eq(SjSafeEnvironmentFile::getSjSafeEnvironmentFileTypeId, MapUtils.getLong(map, "sjSafeEnvironmentFileTypeId")) - .eq(SjSafeEnvironmentFile::getFilePath, MapUtils.getString(map, "filePath")); - queryWrapper.orderByAsc("is_dir"); - List list = list(queryWrapper); + map.put("projectSnList", projectSnList); + List list = sjSafeEnvironmentFileMapper.getFileList(map); return Result.success(list); } 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 8fa3014ee..1ed5f9220 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 @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.weight.entity; import java.io.Serializable; import java.util.Date; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -11,35 +12,42 @@ import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.Pattern; + /** * @Description: 货名 * @author： pds - * @date： 2023-03-21 + * @date： 2023-03-21 * @version： V1.0 */ @Data @TableName("goods_name") -@ApiModel(value="GoodsName实体类",description="GoodsName") +@ApiModel(value = "GoodsName实体类", description = "GoodsName") public class GoodsName implements Serializable { private static final long serialVersionUID = 1L; - + /**主键id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="主键id") private java.lang.Long id ; /**货名*/ - @Excel(name = "货名", width = 15) - @ApiModelProperty(value="货名") - private java.lang.String goodsName ; - /**单价*/ - @Excel(name = "单价", width = 15) - @ApiModelProperty(value="单价") - private java.math.BigDecimal unitPrice ; - /**折方系数*/ - @Excel(name = "折方系数", width = 15) - @ApiModelProperty(value="折方系数") - private java.math.BigDecimal foldSquare ; - /**货名扣重*/ + @Excel(name = "货名", width = 15) + @ApiModelProperty(value = "货名") + private java.lang.String goodsName; + /** + * 单价 + */ + @Excel(name = "单价", width = 15) + @ApiModelProperty(value = "单价") + private String unitPrice; + /** + * 折方系数 + */ + @Excel(name = "折方系数", width = 15) + @ApiModelProperty(value = "折方系数") + private java.math.BigDecimal foldSquare; + /**货名扣重*/ @Excel(name = "货名扣重", width = 15) @ApiModelProperty(value="货名扣重") private java.math.BigDecimal goodsBuckledHeavily ; 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 6627e5975..2de9dab91 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 @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.weight.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -71,7 +68,7 @@ public class WeighBookVehicleInfo implements Serializable { * 过磅类型 */ @Excel(name = "过磅类型", width = 15) - @ApiModelProperty(value = "过磅类型") + @ApiModelProperty(value = "过磅类型（1采购过磅,2销售过磅,3内部过磅,4其他过磅）") private java.lang.Integer weighingType; /** * 录入时间 @@ -103,11 +100,15 @@ public class WeighBookVehicleInfo implements Serializable { @Excel(name = "所属项目SN", width = 15) @ApiModelProperty(value = "所属项目SN") private java.lang.String projectSn; + + @TableLogic + @ApiModelProperty(value = "0正常1已删除") + private Integer deleted; /** * 现场上次拉取的时间 */ @TableField(exist = false) - private String lastAddTime; + private String lastPullTime; /** * 上次查询的id（查询这个id数据之后的数据（不返回这条id数据）） */ diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java index 436c0be0a..9f01dc3d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java @@ -1,16 +1,21 @@ package com.zhgd.xmgl.modules.weight.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; + /** * @Description: 过磅预约车辆信息 * @author： pds - * @date： 2023-03-21 + * @date： 2023-03-21 * @version： V1.0 */ @Mapper public interface WeighBookVehicleInfoMapper extends BaseMapper { + IPage getByLastPullTime(HashMap map, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml index 7d45b9ec8..db667c887 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml @@ -1,5 +1,10 @@ - - \ No newline at end of file + + diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java index 1ca064d2d..71b581924 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java @@ -11,9 +11,11 @@ import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; import com.zhgd.xmgl.modules.weight.mapper.WeighBookVehicleInfoMapper; import com.zhgd.xmgl.modules.weight.service.IWeighBookVehicleInfoService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; /** * @Description: 过磅预约车辆信息 @@ -23,27 +25,36 @@ import javax.servlet.http.HttpServletRequest; */ @Service public class WeighBookVehicleInfoServiceImpl extends ServiceImpl implements IWeighBookVehicleInfoService { + @Autowired + WeighBookVehicleInfoMapper weighBookVehicleInfoMapper; @Override public Result queryPageList(WeighBookVehicleInfo weighBookVehicleInfo, Integer pageNo, Integer pageSize, HttpServletRequest req) { - if (StringUtils.isBlank(weighBookVehicleInfo.getProjectSn())) { + String projectSn = weighBookVehicleInfo.getProjectSn(); + if (StringUtils.isBlank(projectSn)) { return Result.error("projectSn不能为空"); } - String lastAdddatetime = weighBookVehicleInfo.getLastAddTime(); + String lastPullTime = weighBookVehicleInfo.getLastPullTime(); Long lastQueryId = weighBookVehicleInfo.getLastQueryId(); Result> result = new Result>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(StringUtils.isNotBlank(weighBookVehicleInfo.getProjectSn()), WeighBookVehicleInfo::getProjectSn, weighBookVehicleInfo.getProjectSn()) + .eq(StringUtils.isNotBlank(projectSn), WeighBookVehicleInfo::getProjectSn, projectSn) .like(StringUtils.isNotBlank(weighBookVehicleInfo.getSpecifications()), WeighBookVehicleInfo::getSpecifications, weighBookVehicleInfo.getSpecifications()) .like(StringUtils.isNotBlank(weighBookVehicleInfo.getGoodsName()), WeighBookVehicleInfo::getGoodsName, weighBookVehicleInfo.getGoodsName()) .like(StringUtils.isNotBlank(weighBookVehicleInfo.getLicensePlate()), WeighBookVehicleInfo::getLicensePlate, weighBookVehicleInfo.getLicensePlate()) .gt(lastQueryId != null, WeighBookVehicleInfo::getId, lastQueryId); - if (StringUtils.isNotBlank(lastAdddatetime)) { - DateTime dateTime = DateUtil.parse(lastAdddatetime); - queryWrapper.ge(WeighBookVehicleInfo::getAddDateTime, dateTime); - } + IPage pageList; Page page = new Page(pageNo, pageSize); - IPage pageList = page(page, queryWrapper); + if (StringUtils.isNotBlank(lastPullTime)) { + DateTime dateTime = DateUtil.parse(lastPullTime); + queryWrapper.ge(WeighBookVehicleInfo::getAddDateTime, dateTime); + HashMap map = new HashMap<>(); + map.put("projectSn", projectSn); + map.put("lastPullTime", lastPullTime); + pageList = weighBookVehicleInfoMapper.getByLastPullTime(map, page); + } else { + pageList = page(page, queryWrapper); + } result.setSuccess(true); result.setResult(pageList); return result; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml index b2b7e2782..3cd971b2a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml @@ -5,19 +5,25 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/pdf/MyHeaderFooter2.java b/src/main/java/com/zhgd/xmgl/pdf/MyHeaderFooter2.java index 86e2f4973..964931897 100644 --- a/src/main/java/com/zhgd/xmgl/pdf/MyHeaderFooter2.java +++ b/src/main/java/com/zhgd/xmgl/pdf/MyHeaderFooter2.java @@ -3,9 +3,9 @@ package com.zhgd.xmgl.pdf; import com.itextpdf.text.*; import com.itextpdf.text.pdf.*; - + import java.io.IOException; - + public class MyHeaderFooter2 extends PdfPageEventHelper { // 总页数 PdfTemplate totalPage; @@ -19,7 +19,7 @@ public class MyHeaderFooter2 extends PdfPageEventHelper { e.printStackTrace(); } } - + // 打开文档时，创建一个总页数的模版 @Override public void onOpenDocument(PdfWriter writer, Document document) { @@ -36,7 +36,7 @@ public class MyHeaderFooter2 extends PdfPageEventHelper { table.setLockedWidth(true); table.getDefaultCell().setFixedHeight(-10); table.getDefaultCell().setBorder(Rectangle.BOTTOM); - + table.addCell(new Paragraph("页脚", hfFont));// 可以直接使用addCell(str)，不过不能指定字体，中文无法显示 table.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT); table.addCell(new Paragraph("第" + writer.getPageNumber() + "页/", hfFont)); @@ -51,12 +51,12 @@ public class MyHeaderFooter2 extends PdfPageEventHelper { throw new ExceptionConverter(de); } } - + // 全部完成后，将总页数的pdf模版写到指定位置 @Override public void onCloseDocument(PdfWriter writer,Document document) { String text = "总" + (writer.getPageNumber()) + "页"; ColumnText.showTextAligned(totalPage, Element.ALIGN_LEFT, new Paragraph(text,hfFont), 2, 2, 0); } - -} \ No newline at end of file + +} diff --git a/src/main/resources/application-other-env-show.properties b/src/main/resources/application-other-env-show.properties new file mode 100644 index 000000000..51e9b06ce --- /dev/null +++ b/src/main/resources/application-other-env-show.properties @@ -0,0 +1,71 @@ +http.port=30260 +#http.port=6023 +#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC +spring.datasource.url=jdbc:mysql://139.9.66.234:33306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://127.0.0.1:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) +spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) +server.port=12643 +#server.port=30246 +basePath=F:/zhgd/itbgpImage/ +server.tomcat.basedir=F:/zhgd/tempImage/ +arcsoft.dllPath=F:/zhgd/dll +#basePath=F:/zhgd/itbgpImage/ +#server.tomcat.basedir=F:/zhgd/tempImage/ +#arcsoft.dllPath=F:/zhgd/dll +security.enable=true +isGetStandardData=false +isGetEnvironmentData=false +isGetFaceFeatureDate=false +#海康视频报警图片IP端口替换 +video.alarm.newUrl=223.82.100.80:6040 +wx-appid= +wx-AppSecret= +mqtt-scope=devTopic +serverUrl=http://124.71.178.44:30249 +#serverUrl=http://127.0.0.1:6023 +#视频分析url +video-analysis-url= +#客户端 License相关配置 +license.licensePath=E:/license/license.lic +license.publicKeysStorePath=E:/license/publicCerts.keystore +#文件上传 +zhgd.file-storage.type=local +#文件存储配置 +#默认使用的存储平台 +spring.file-storage.default-platform=local +#".min.jpg" #缩略图后缀，例如【.min.jpg】【.png】 +spring.file-storage.thumbnail-suffix=.jpg +# 本地存储，不使用的情况下可以不写 +# 存储平台标识 +spring.file-storage.local[0].platform=local +#启用存储 +spring.file-storage.local[0].enable-storage=true +#启用访问（线上请使用 Nginx 配置，效率更高） +spring.file-storage.local[0].enable-access=false +# 访问域名，例如：“http://127.0.0.1:6023/image/”，注意后面要和 path-patterns 保持一致，“/”结尾，本地存储建议使用相对路径，方便后期更换域名 +spring.file-storage.local[0].domain= +# 存储地址 +spring.file-storage.local[0].base-path=F:/zhgd/itbgpImage/ +# 访问路径，开启 enable-access 后，通过此路径可以访问到上传的文件 +spring.file-storage.local[0].path-patterns= +server.ssl.enabled=false +#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A +defaultZwComapnySn= +spring.file-storage.aliyun-oss[0].platform=aliyun-oss +spring.file-storage.aliyun-oss[0].enable-storage=false +spring.file-storage.aliyun-oss[0].access-key= +spring.file-storage.aliyun-oss[0].secret-key= +spring.file-storage.aliyun-oss[0].end-point= +spring.file-storage.aliyun-oss[0].bucket-name= +# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/ +spring.file-storage.aliyun-oss[0].domain= +spring.file-storage.aliyun-oss[0].base-path= +# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D +spring.boot.admin.client.instance.service-url=http://localhost:18070 +spring.boot.admin.client.instance.name=zjsj +# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740 +double-carbon.water-data-url=http://test.cesms.net +double-carbon.ammeter-data-url=http://test.cesms.net +#\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7 +high_formwork.netty.port=15333 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3d8832fae..f3e01fd45 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -50,6 +50,10 @@ spring.jackson.defaultPropertyInclusion=ALWAYS # mybatis \u914D\u7F6E mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +# 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) +#mybatis-plus.global-config.db-config.logic-delete-field=flag +mybatis-plus.global-config.db-config.logic-delete-value=1 +mybatis-plus.global-config.db-config.logic-not-delete-value=0 # mvc \u89C6\u56FE\u5BF9\u8C61\u914D\u7F6E spring.mvc.view.prefix=/ spring.mvc.view.suffix=.html @@ -165,4 +169,4 @@ koyoe.base-url=https://solar.koyoe.com koyoe.get-token=${koyoe.base-url}/third-party/api/token?grant_type=client_credentials koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s # \u662F\u5426\u8BC1\u4E66\u9A8C\u8BC1 -is-license=false \ No newline at end of file +is-license=false