From 4197806acf2e2e6add90aadc4ff220b0295dd7d8 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 5 Sep 2023 10:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E9=99=8D=E6=9C=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/EntEngineeringController.java | 6 +- .../enterprise/EntLifterController.java | 7 +- .../EntLiftingDeviceController.java | 10 +-- .../EntLiftingDeviceUseController.java | 28 ++++++++ .../enterprise/EntTowerCraneController.java | 10 +-- .../government/GovLifterAlarmController.java | 1 + .../GovLifterCurrentDataController.java | 1 + .../GovLiftingDeviceController.java | 34 +++++++--- .../GovLiftingDeviceExamineController.java | 21 ++++++ .../GovLiftingDeviceUseController.java | 23 +++++++ .../controller/project/LifterController.java | 7 +- .../project/LiftingDeviceUseController.java | 28 ++++++++ .../project/TowerCraneController.java | 7 +- .../service/ICheckAcceptPlanService.java | 4 +- .../impl/CheckAcceptPlanServiceImpl.java | 5 +- .../modules/safety/entity/LiftingDevice.java | 4 +- .../safety/entity/LiftingDeviceExamine.java | 2 +- .../safety/entity/LiftingDeviceUse.java | 6 +- .../safety/service/ILiftingDeviceService.java | 4 +- .../impl/LiftingDeviceExamineServiceImpl.java | 4 +- .../impl/LiftingDeviceServiceImpl.java | 64 ++++++++++++++----- .../safety/vo/LiftingDeviceExamineVo.java | 3 + .../modules/safety/vo/LiftingDeviceUseVo.java | 16 +++++ .../modules/wisdom/mapper/LifterMapper.java | 10 +-- .../wisdom/mapper/TowerCraneMapper.java | 1 + .../wisdom/mapper/xml/LifterMapper.xml | 3 + .../wisdom/mapper/xml/TowerCraneMapper.xml | 3 + .../wisdom/service/ILifterService.java | 4 ++ .../wisdom/service/ITowerCraneService.java | 4 ++ .../service/impl/LifterAlarmServiceImpl.java | 2 +- .../impl/LifterCurrentDataServiceImpl.java | 6 ++ .../service/impl/LifterServiceImpl.java | 24 +++++++ .../impl/TowerCraneAlarmServiceImpl.java | 2 +- .../service/impl/TowerCraneServiceImpl.java | 24 +++++++ .../java/com/zhgd/xmgl/util/ParamEnum.java | 10 ++- 35 files changed, 316 insertions(+), 72 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/vo/LiftingDeviceUseVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java index 634692e..0f49404 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java @@ -58,7 +58,8 @@ public class EntEngineeringController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map); Page page = PageUtil.getPage(map); - wrapper.eq("examine_state", 3); + wrapper.lambda().eq(Engineering::getExamineState, 3); + wrapper.lambda().orderByDesc(Engineering::getCreateTime); IPage pageList = engineeringService.getPageList(page, wrapper); return Result.success(pageList); } @@ -73,7 +74,8 @@ public class EntEngineeringController { @PostMapping(value = "/list") public Result> list(@ApiIgnore @RequestBody Engineering engineering) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(engineering); - queryWrapper.eq("examine_state", 3); + queryWrapper.lambda().eq(Engineering::getExamineState, 3); + queryWrapper.lambda().orderByDesc(Engineering::getCreateTime); List engineeringList = engineeringService.list(queryWrapper); return Result.success(engineeringList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java index 256ff5b..d286347 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java @@ -9,7 +9,6 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.wisdom.entity.Lifter; import com.zhgd.xmgl.modules.wisdom.service.ILifterService; -import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -91,8 +90,7 @@ public class EntLifterController { @ApiOperation(value = " 添加升降机信息", notes = "添加升降机信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody Lifter lifter) { - lifter.setCreateBy(SecurityUtil.getUser().getUserId()); - lifterService.save(lifter); + lifterService.saveInfo(lifter); return Result.success("添加成功！"); } @@ -111,8 +109,7 @@ public class EntLifterController { if (lifterEntity == null) { result.error500("未找到对应实体"); } else { - lifter.setUpdateBy(SecurityUtil.getUser().getUserId()); - boolean ok = lifterService.updateById(lifter); + boolean ok = lifterService.updateInfo(lifter); if (ok) { result.success("修改成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java index 0d60cd1..1020853 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java @@ -9,8 +9,8 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.safety.dto.LiftingDeviceExamineDto; import com.zhgd.xmgl.modules.safety.entity.LiftingDevice; -import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceService; +import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceUseVo; import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -112,10 +112,10 @@ public class EntLiftingDeviceController { result.error500("未找到对应实体"); return result; } - /* if (liftingDevice.getIdentification() != 0) { + if (liftingDevice.getIdentification() != 0) { result.error500("有未通过的申请,请通过后再提交申请"); return result; - }*/ + } boolean apply = liftingDeviceService.apply(liftingDeviceExamineVo); if (apply) { result.success("修改成功!"); @@ -133,14 +133,16 @@ public class EntLiftingDeviceController { @OperLog(operModul = "起重机械设备管理", operType = "新增", operDesc = "设备提交安拆审批申请") @ApiOperation(value = " 设备提交安拆审批申请", notes = "设备提交安拆审批申请", httpMethod = "POST") @PostMapping(value = "/useApply") - public Result useApply(@RequestBody LiftingDeviceUse liftingDeviceUse) { + public Result useApply(@RequestBody LiftingDeviceUseVo liftingDeviceUse) { Result result = new Result(); LiftingDevice liftingDevice = liftingDeviceService.getById(liftingDeviceUse.getDeviceId()); if (liftingDevice == null) { result.error500("未找到对应实体"); + return result; } if (liftingDevice.getIdentification() != 0) { result.error500("有正在进行中的申请,请完成后再提交申请"); + return result; } boolean apply = liftingDeviceService.useApply(liftingDeviceUse); if (apply) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceUseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceUseController.java index edc4c20..553b766 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceUseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceUseController.java @@ -2,13 +2,17 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceUseService; +import com.zhgd.xmgl.util.ParamEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -42,6 +46,9 @@ public class EntLiftingDeviceUseController { @Autowired private ILiftingDeviceUseService liftingDeviceUseService; + @Autowired + private IAnnexFileService annexFileService; + /** * 分页列表查询 * @@ -181,4 +188,25 @@ public class EntLiftingDeviceUseController { } return result; } + + /** + * 通过id查询附件信息 + * @return + */ + @OperLog(operModul = "起重机械设备安拆记录管理", operType = "查询", operDesc = "通过id查询附件信息") + @ApiOperation(value = "通过id查询附件信息", notes = "通过id查询附件信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "审批ID", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryAnnexFile") + public Result> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceUse liftingDeviceUse) { + Result> result = new Result>(); + LiftingDeviceUse liftingDeviceUseEntity = liftingDeviceUseService.getById(liftingDeviceUse.getId()); + if (liftingDeviceUseEntity == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, liftingDeviceUse.getId()) + .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue()))); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java index ff24d9c..3469118 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java @@ -1,18 +1,14 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; -import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -96,8 +92,7 @@ public class EntTowerCraneController { @ApiOperation(value = " 添加塔吊起重机信息", notes = "添加塔吊起重机信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody TowerCrane towerCrane) { - towerCrane.setCreateBy(SecurityUtil.getUser().getUserId()); - towerCraneService.save(towerCrane); + towerCraneService.saveInfo(towerCrane); return Result.success("添加成功！"); } @@ -116,8 +111,7 @@ public class EntTowerCraneController { if (towerCraneEntity == null) { result.error500("未找到对应实体"); } else { - towerCrane.setUpdateBy(SecurityUtil.getUser().getUserId()); - boolean ok = towerCraneService.updateById(towerCrane); + boolean ok = towerCraneService.updateInfo(towerCrane); if (ok) { result.success("修改成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java index 3e92e26..0c2644e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java @@ -69,6 +69,7 @@ public class GovLifterAlarmController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterAlarm::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterAlarm::getCreateTime); IPage pageList = lifterAlarmService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java index f399b54..eb66413 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java @@ -76,6 +76,7 @@ public class GovLifterCurrentDataController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(LifterCurrentData::getEngineeringSn, StrUtil.EMPTY); } + queryWrapper.lambda().orderByDesc(LifterCurrentData::getCreateTime); IPage pageList = lifterCurrentDataService.page(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java index 3f61a58..c4143f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java @@ -10,6 +10,7 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.safety.entity.LiftingDevice; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceService; import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceExamineVo; +import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -64,7 +65,8 @@ public class GovLiftingDeviceController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(LiftingDevice.class, map); Page page = PageUtil.getPage(map); - if (MapUtils.getInteger(map, "identification") == 6) { + Integer identification = MapUtils.getInteger(map, "identification"); + if (identification != null && identification == 6) { queryWrapper.in("identification", "6,7"); } IPage pageList = liftingDeviceService.page(page, queryWrapper); @@ -132,6 +134,27 @@ public class GovLiftingDeviceController { return result; } + /** + * 通过id查询详细信息 + * + * @return + */ + @OperLog(operModul = "起重机械设备管理", operType = "查询", operDesc = "通过id查询起重机械设备详细信息") + @ApiOperation(value = "通过id查询起重机械设备详细信息", notes = "通过id查询起重机械设备详细信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "项目工程表ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/queryDetailById") + public Result queryDetailById(@ApiIgnore @RequestBody LiftingDevice liftingDeviceEntity) { + Result result = new Result(); + LiftingDevice liftingDevice = liftingDeviceService.getById(liftingDeviceEntity.getId()); + if (liftingDevice == null) { + result.error500("未找到对应实体"); + } else { + LiftingDeviceVo liftingDeviceVo = liftingDeviceService.queryDetailById(liftingDeviceEntity.getId()); + result.setResult(liftingDeviceVo); + result.setSuccess(true); + } + return result; + } /** * 审批 @@ -143,13 +166,8 @@ public class GovLiftingDeviceController { @PostMapping(value = "/examine") public Result examine(@RequestBody LiftingDeviceExamineVo liftingDeviceExamineVo) { Result result = new Result(); - LiftingDevice liftingDevice = liftingDeviceService.getById(liftingDeviceExamineVo.getDeviceId()); - if (liftingDevice == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(liftingDeviceService.examine(liftingDeviceExamineVo)); - result.setSuccess(true); - } + result.setResult(liftingDeviceService.examine(liftingDeviceExamineVo)); + result.setSuccess(true); return result; } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceExamineController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceExamineController.java index 5918abd..7f6c556 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceExamineController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceExamineController.java @@ -7,6 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceExamine; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceExamineService; import io.swagger.annotations.Api; @@ -80,4 +81,24 @@ public class GovLiftingDeviceExamineController { List list = liftingDeviceExamineService.list(queryWrapper); return Result.success(list); } + + /** + * 通过id查询附件信息 + * @return + */ + @OperLog(operModul = "起重机械设备管理", operType = "查询", operDesc = "通过id查询附件信息") + @ApiOperation(value = "通过id查询附件信息", notes = "通过id查询附件信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "审批ID", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryAnnexFile") + public Result> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceExamine liftingDeviceExamine) { + Result> result = new Result>(); + LiftingDeviceExamine liftingDeviceExamineEntity = liftingDeviceExamineService.getById(liftingDeviceExamine.getId()); + if (liftingDeviceExamineEntity == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(liftingDeviceExamineService.queryAnnexFile(liftingDeviceExamine.getId())); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceUseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceUseController.java index 327eec3..3113874 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceUseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceUseController.java @@ -2,13 +2,17 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceUseService; +import com.zhgd.xmgl.util.ParamEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -41,6 +45,8 @@ public class GovLiftingDeviceUseController { @Autowired private ILiftingDeviceUseService liftingDeviceUseService; + @Autowired + private IAnnexFileService annexFileService; /** * 分页列表查询 * @@ -96,4 +102,21 @@ public class GovLiftingDeviceUseController { } return result; } + + @OperLog(operModul = "起重机械设备安拆记录管理", operType = "查询", operDesc = "通过id查询附件信息") + @ApiOperation(value = "通过id查询附件信息", notes = "通过id查询附件信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "审批ID", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryAnnexFile") + public Result> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceUse liftingDeviceUse) { + Result> result = new Result>(); + LiftingDeviceUse liftingDeviceUseEntity = liftingDeviceUseService.getById(liftingDeviceUse.getId()); + if (liftingDeviceUseEntity == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, liftingDeviceUse.getId()) + .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue()))); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java index 2cca06e..1bb1814 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java @@ -12,7 +12,6 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.entity.Lifter; import com.zhgd.xmgl.modules.wisdom.service.ILifterService; -import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -101,8 +100,7 @@ public class LifterController { @ApiOperation(value = " 添加升降机信息", notes = "添加升降机信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody Lifter lifter) { - lifter.setCreateBy(SecurityUtil.getUser().getUserId()); - lifterService.save(lifter); + lifterService.saveInfo(lifter); return Result.success("添加成功！"); } @@ -121,8 +119,7 @@ public class LifterController { if (lifterEntity == null) { result.error500("未找到对应实体"); } else { - lifter.setUpdateBy(SecurityUtil.getUser().getUserId()); - boolean ok = lifterService.updateById(lifter); + boolean ok = lifterService.updateInfo(lifter); if (ok) { result.success("修改成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceUseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceUseController.java index d5d56ca..46f0397 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceUseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceUseController.java @@ -2,13 +2,17 @@ package com.zhgd.xmgl.modules.basicdata.controller.project; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceUseService; +import com.zhgd.xmgl.util.ParamEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -42,6 +46,9 @@ public class LiftingDeviceUseController { @Autowired private ILiftingDeviceUseService liftingDeviceUseService; + @Autowired + private IAnnexFileService annexFileService; + /** * 分页列表查询 * @@ -97,4 +104,25 @@ public class LiftingDeviceUseController { } return result; } + + /** + * 通过id查询附件信息 + * @return + */ + @OperLog(operModul = "起重机械设备安拆记录管理", operType = "查询", operDesc = "通过id查询附件信息") + @ApiOperation(value = "通过id查询附件信息", notes = "通过id查询附件信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "审批ID", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/queryAnnexFile") + public Result> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceUse liftingDeviceUse) { + Result> result = new Result>(); + LiftingDeviceUse liftingDeviceUseEntity = liftingDeviceUseService.getById(liftingDeviceUse.getId()); + if (liftingDeviceUseEntity == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, liftingDeviceUse.getId()) + .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue()))); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java index a048b6b..ccf827a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java @@ -12,7 +12,6 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; -import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -101,8 +100,7 @@ public class TowerCraneController { @ApiOperation(value = " 添加塔吊起重机信息", notes = "添加塔吊起重机信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody TowerCrane towerCrane) { - towerCrane.setCreateBy(SecurityUtil.getUser().getUserId()); - towerCraneService.save(towerCrane); + towerCraneService.saveInfo(towerCrane); return Result.success("添加成功！"); } @@ -121,8 +119,7 @@ public class TowerCraneController { if (towerCraneEntity == null) { result.error500("未找到对应实体"); } else { - towerCrane.setUpdateBy(SecurityUtil.getUser().getUserId()); - boolean ok = towerCraneService.updateById(towerCrane); + boolean ok = towerCraneService.updateInfo(towerCrane); if (ok) { result.success("修改成功!"); } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/ICheckAcceptPlanService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/ICheckAcceptPlanService.java index d18bc0e..a0a0b21 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/ICheckAcceptPlanService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/ICheckAcceptPlanService.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.quality.service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.quality.dto.CheckAcceptPlanEntDto; @@ -17,7 +17,7 @@ import java.util.Map; */ public interface ICheckAcceptPlanService extends IService { - Page pageList(Page page, Wrapper wrapper); + Page pageList(Page page, QueryWrapper wrapper); Page pageListForSuperior(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java index 854028a..c72529e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.quality.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -41,7 +41,8 @@ public class CheckAcceptPlanServiceImpl extends ServiceImpl pageList(Page page, Wrapper wrapper) { + public Page pageList(Page page, QueryWrapper wrapper) { + wrapper.lambda().orderByDesc(CheckAcceptPlan::getCreateTime); Page checkAcceptPlanPage = baseMapper.pageList(page, wrapper); List systemDictData = systemDictDataService.getByType(ParamEnum.SysDictType.CHECK_ACCEPT_TYPE.getValue()); for (CheckAcceptPlan record : checkAcceptPlanPage.getRecords()) { diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java index d7fc66d..4235c09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java @@ -66,7 +66,7 @@ public class LiftingDevice implements Serializable { */ @Excel(name = "是否新设备（1是，2不是）", width = 15) @ApiModelProperty(value = "是否新设备（1是，2不是）") - private String newEquipment; + private Integer newEquipment; /** * 许可证 */ @@ -110,7 +110,7 @@ public class LiftingDevice implements Serializable { */ @Excel(name = "是否原购产品（1：是，0不是）", width = 15) @ApiModelProperty(value = "是否原购产品（1：是，0不是）") - private String theShipper; + private Integer theShipper; /** * 设备状态（0：提交未审核1：正常，2：临期，3：延期，4：注销禁用，5：报废） */ diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java index 7f33680..8eb4538 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java @@ -70,7 +70,7 @@ public class LiftingDeviceExamine implements Serializable { /** * 审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;6:设备安装;7:设备拆卸) */ - @Excel(name = "审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;)", width = 15) + @Excel(name = "审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;6:设备安装;7:设备拆卸)", width = 15) @ApiModelProperty(value = "审批类型(1:产权备案;2:设备延期;3:遗失补证;4:设备报废;5:设备注销;6:设备安装;7:设备拆卸)") private Integer type; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceUse.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceUse.java index ec886cb..232c81f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceUse.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceUse.java @@ -66,7 +66,7 @@ public class LiftingDeviceUse implements Serializable { */ @Excel(name = "企业SN", width = 15) @ApiModelProperty(value = "企业SN") - private Integer enterpriseSn; + private String enterpriseSn; /** * 企业名称（产权单位） */ @@ -106,7 +106,9 @@ public class LiftingDeviceUse implements Serializable { /** * 安装日期 */ - @Excel(name = "安装日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "安装日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "安装日期") private Date addTime; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java index 9e30adc..3ee9a25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java @@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.safety.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.safety.dto.LiftingDeviceExamineDto; import com.zhgd.xmgl.modules.safety.entity.LiftingDevice; -import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse; import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceExamineVo; +import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceUseVo; import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceVo; /** @@ -21,7 +21,7 @@ public interface ILiftingDeviceService extends IService { boolean apply(LiftingDeviceExamineDto liftingDeviceExamineVo); - boolean useApply(LiftingDeviceUse liftingDeviceUse); + boolean useApply(LiftingDeviceUseVo liftingDeviceUse); LiftingDeviceVo queryDetailById(Long id); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java index 04a3a1b..fa841f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java @@ -6,6 +6,7 @@ import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceExamine; import com.zhgd.xmgl.modules.safety.mapper.LiftingDeviceExamineMapper; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceExamineService; +import com.zhgd.xmgl.util.ParamEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +28,7 @@ public class LiftingDeviceExamineServiceImpl extends ServiceImpl queryAnnexFile(Long id) { - return annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, id)); + return annexFileService.list(Wrappers.lambdaQuery().eq(AnnexFile::getRelevanceId, id) + .eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_EXAMINE)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java index 5324337..efe2a5e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.Enterprise; import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; +import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService; import com.zhgd.xmgl.modules.safety.dto.LiftingDeviceExamineDto; import com.zhgd.xmgl.modules.safety.entity.LiftingDevice; @@ -17,9 +19,11 @@ import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceExamineService; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceService; import com.zhgd.xmgl.modules.safety.service.ILiftingDeviceUseService; import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceExamineVo; +import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceUseVo; import com.zhgd.xmgl.modules.safety.vo.LiftingDeviceVo; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; +import com.zhgd.xmgl.util.ParamEnum; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,6 +54,9 @@ public class LiftingDeviceServiceImpl extends ServiceImpl annexFiles = liftingDeviceVo.getAnnexFiles(); annexFiles.stream().forEach(a -> { + a.setFileType(ParamEnum.AnnexFileType.LIFTER_DEVICE.getValue()); a.setRelevanceId(liftingDeviceVo.getId().toString()); }); annexFileService.saveBatch(annexFiles); @@ -77,45 +85,60 @@ public class LiftingDeviceServiceImpl extends ServiceImpl 5) { //安拆审批 - LiftingDeviceUse liftingDeviceUse = liftingDeviceUseService.getOne(Wrappers.lambdaQuery().eq(LiftingDeviceUse::getDeviceId, - liftingDeviceExamineVo.getDeviceId()).eq(LiftingDeviceUse::getExamineState, 0)); + LiftingDeviceUse liftingDeviceUse = liftingDeviceUseService.getById(liftingDeviceExamineVo.getId()); liftingDeviceUse.setExamineState(liftingDeviceExamineVo.getState()); liftingDeviceUse.setWhy(liftingDeviceExamineVo.getExamineResult()); liftingDeviceUse.setAuditName(user.getRealName()); liftingDeviceUse.setAuditId(user.getUserId()); + liftingDeviceUse.setId(liftingDeviceExamineVo.getId()); liftingDeviceUseService.updateById(liftingDeviceUse); if (liftingDeviceExamineVo.getState() == 1) { updateWrapper.set(LiftingDevice::getEquipmentType, getEquipmentType(liftingDeviceExamineVo.getType())); updateWrapper.set(LiftingDevice::getEquipmentUse, liftingDeviceExamineVo.getType() == 6 ? 1 : 0); if (liftingDeviceExamineVo.getType() == 6) { updateWrapper.set(LiftingDevice::getEngineeringSn, liftingDeviceUse.getEngineeringSn()); + updateWrapper.set(LiftingDevice::getProjectSn, engineeringService.getOne(Wrappers.lambdaQuery().eq(Engineering::getEngineeringSn, liftingDeviceUse.getEngineeringSn())).getProjectSn()); } else { updateWrapper.set(LiftingDevice::getEngineeringSn, null); } } + } if (liftingDeviceExamineVo.getType() == 1) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.set(LiftingDeviceExamine::getState, liftingDeviceExamineVo.getState()); + wrapper.set(LiftingDeviceExamine::getExamineResult, liftingDeviceExamineVo.getExamineResult()); + wrapper.set(LiftingDeviceExamine::getExamineName, user.getRealName()); + wrapper.set(LiftingDeviceExamine::getExamineTime, new Date()); + wrapper.set(LiftingDeviceExamine::getExamineBy, user.getUserId()); + wrapper.eq(LiftingDeviceExamine::getDeviceId, liftingDeviceExamineVo.getDeviceId()); + wrapper.eq(LiftingDeviceExamine::getState, 0); + wrapper.eq(LiftingDeviceExamine::getType, liftingDeviceExamineVo.getType()); + liftingDeviceExamineService.update(wrapper); + if (liftingDeviceExamineVo.getState() == 1) { + updateWrapper.set(LiftingDevice::getEquipmentType, getEquipmentType(liftingDeviceExamineVo.getType())); + buildProjectInspectNumber(liftingDeviceExamineVo); + } } else { // 其他审批 LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); wrapper.set(LiftingDeviceExamine::getState, liftingDeviceExamineVo.getState()); wrapper.set(LiftingDeviceExamine::getExamineResult, liftingDeviceExamineVo.getExamineResult()); wrapper.set(LiftingDeviceExamine::getExamineName, user.getRealName()); + wrapper.set(LiftingDeviceExamine::getExamineTime, new Date()); wrapper.set(LiftingDeviceExamine::getExamineBy, user.getUserId()); - wrapper.eq(LiftingDeviceExamine::getDeviceId, liftingDeviceExamineVo.getDeviceId()); - wrapper.eq(LiftingDeviceExamine::getState, 0); + wrapper.eq(LiftingDeviceExamine::getId, liftingDeviceExamineVo.getId()); liftingDeviceExamineService.update(wrapper); if (liftingDeviceExamineVo.getState() == 1) { updateWrapper.set(LiftingDevice::getEquipmentType, getEquipmentType(liftingDeviceExamineVo.getType())); } } + updateWrapper.set(LiftingDevice::getIdentification, 0); + updateWrapper.eq(LiftingDevice::getId, liftingDeviceExamineVo.getDeviceId()); return this.update(updateWrapper); } @Override public boolean apply(LiftingDeviceExamineDto liftingDeviceExamineVo) { SecurityUser user = SecurityUtil.getUser(); - if (liftingDeviceExamineVo.getType() == 1) { - buildProjectInspectNumber(liftingDeviceExamineVo); - } liftingDeviceExamineVo.setApplyBy(user.getUserId()); liftingDeviceExamineVo.setApplyName(user.getRealName()); liftingDeviceExamineVo.setApplyTime(new Date()); @@ -127,6 +150,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl annexFiles = liftingDeviceExamineVo.getAnnexFiles(); annexFiles.stream().forEach(a -> { + a.setFileType(ParamEnum.AnnexFileType.LIFTER_DEVICE_EXAMINE.getValue()); a.setRelevanceId(liftingDeviceExamineVo.getId().toString()); }); annexFileService.saveBatch(annexFiles); @@ -135,16 +159,26 @@ public class LiftingDeviceServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaUpdate(); - wrapper.set(LiftingDevice::getIdentification, liftingDeviceUse.getInstallationType()); - wrapper.eq(LiftingDevice::getId, liftingDeviceUse.getDeviceId()); - this.update(wrapper); liftingDeviceUse.setAuditId(user.getUserId()); liftingDeviceUse.setAuditName(user.getRealName()); liftingDeviceUse.setAddUpdate(new Date()); - return liftingDeviceUseService.save(liftingDeviceUse); + liftingDeviceUse.setEnterpriseSn(user.getSn()); + boolean flag = liftingDeviceUseService.saveOrUpdate(liftingDeviceUse); + if (flag) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.set(LiftingDevice::getIdentification, liftingDeviceUse.getInstallationType()); + wrapper.eq(LiftingDevice::getId, liftingDeviceUse.getDeviceId()); + this.update(wrapper); + List annexFiles = liftingDeviceUse.getAnnexFiles(); + annexFiles.stream().forEach(a -> { + a.setFileType(ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue()); + a.setRelevanceId(liftingDeviceUse.getId().toString()); + }); + annexFileService.saveBatch(annexFiles); + } + return flag; } @Override @@ -178,8 +212,8 @@ public class LiftingDeviceServiceImpl extends ServiceImpl annexFiles; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java index 7827457..66b87e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java @@ -1,11 +1,9 @@ package com.zhgd.xmgl.modules.wisdom.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.wisdom.entity.Lifter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.wisdom.entity.Lifter; +import org.apache.ibatis.annotations.Mapper; /** * @Description: 升降机 @@ -14,6 +12,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface LifterMapper extends BaseMapper { + Lifter getByNumber(String number, String ignore); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java index 5e022e7..ad6d5c7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java @@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper; @DataScope public interface TowerCraneMapper extends BaseMapper { + TowerCrane getByNumber(String number, String ignore); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml index 097b01f..352462b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml index fb88123..f7b9f6d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml @@ -2,4 +2,7 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java index b66f8fc..4047350 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java @@ -19,4 +19,8 @@ public interface ILifterService extends IService { Page engineeringPageList(Map map); Page projectPageList(Map map); + + boolean saveInfo(Lifter lifter); + + boolean updateInfo(Lifter lifter); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java index 33d9989..af456cd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java @@ -19,4 +19,8 @@ public interface ITowerCraneService extends IService { Page engineeringPageList(Map map); Page projectPageList(Map map); + + boolean saveInfo(TowerCrane towerCrane); + + boolean updateInfo(TowerCrane towerCrane); } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java index eda4101..25f45de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java @@ -48,7 +48,7 @@ public class LifterAlarmServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initPageQueryWrapper(LifterAlarm.class, map); Integer dayRange = MapUtils.getInteger(map, "dayRange"); if (dayRange != null) { - queryWrapper.lambda().between(LifterAlarm::getCreateTime, DateUtil.offsetDay(new Date(), dayRange), DateUtil.endOfDay(new Date())); + queryWrapper.lambda().between(LifterAlarm::getCreateTime, DateUtil.offsetDay(new Date(), -dayRange), DateUtil.endOfDay(new Date())); } queryWrapper.lambda().orderByDesc(LifterAlarm::getCreateTime); List list = this.list(queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java index a47ba55..78ec738 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.wisdom.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.redis.lock.RedisRepository; @@ -41,6 +42,11 @@ public class LifterCurrentDataServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaUpdate(); + wrapper.set(Lifter::getOnline, 1); + wrapper.eq(Lifter::getOnline, 0); + wrapper.eq(Lifter::getId, lifterCurrentData.getDevId()); + lifterService.update(wrapper); setInfo(lifterCurrentData, lifter); } return flag; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java index a696f89..534d8c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.dto.LifterEntDto; @@ -15,6 +16,7 @@ import com.zhgd.xmgl.modules.wisdom.entity.LifterAlarm; import com.zhgd.xmgl.modules.wisdom.mapper.LifterMapper; import com.zhgd.xmgl.modules.wisdom.service.ILifterAlarmService; import com.zhgd.xmgl.modules.wisdom.service.ILifterService; +import com.zhgd.xmgl.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,4 +68,26 @@ public class LifterServiceImpl extends ServiceImpl impleme }); return lifterProjectDtoPage; } + + @Override + public boolean saveInfo(Lifter lifter) { + Lifter lifterEntity = baseMapper.getByNumber(lifter.getDevNumber(), "ignoreDataScope"); + if (lifterEntity != null) { + throw new CustomException("设备编码已存在，请重新输入！"); + } else { + lifter.setCreateBy(SecurityUtil.getUser().getUserId()); + } + return this.save(lifter); + } + + @Override + public boolean updateInfo(Lifter lifter) { + Lifter lifterEntity = baseMapper.getByNumber(lifter.getDevNumber(), "ignoreDataScope"); + if (lifterEntity != null && !lifterEntity.getDevNumber().equals(lifter.getDevNumber())) { + throw new CustomException("设备编码已存在，请重新输入！"); + } else { + lifter.setUpdateBy(SecurityUtil.getUser().getUserId()); + } + return this.updateById(lifter); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java index f4e201f..451f003 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java @@ -47,7 +47,7 @@ public class TowerCraneAlarmServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initPageQueryWrapper(TowerCraneAlarm.class, map); Integer dayRange = MapUtils.getInteger(map, "dayRange"); if (dayRange != null) { - queryWrapper.lambda().between(TowerCraneAlarm::getCreateTime, DateUtil.offsetDay(new Date(), dayRange), DateUtil.endOfDay(new Date())); + queryWrapper.lambda().between(TowerCraneAlarm::getCreateTime, DateUtil.offsetDay(new Date(), -dayRange), DateUtil.endOfDay(new Date())); } queryWrapper.lambda().orderByDesc(TowerCraneAlarm::getCreateTime); List list = this.list(queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java index 8e30016..9ce26bf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.dto.TowerCraneEntDto; @@ -15,6 +16,7 @@ import com.zhgd.xmgl.modules.wisdom.entity.TowerCraneAlarm; import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneMapper; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.wisdom.service.ITowerCraneService; +import com.zhgd.xmgl.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,4 +68,26 @@ public class TowerCraneServiceImpl extends ServiceImpl