admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升降机调整

Browse Source
This commit is contained in:
pengjie 2023-09-05 10:09:22 +08:00
parent 8b36da209c
commit 4197806acf
35 changed files with 316 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java
View File

@ -58,7 +58,8 @@ public class EntEngineeringController {
public Result<IPage<Engineering>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<Engineering> wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map);
Page<Engineering> page = PageUtil.getPage(map);
wrapper.eq("examine_state", 3);
wrapper.lambda().eq(Engineering::getExamineState, 3);
wrapper.lambda().orderByDesc(Engineering::getCreateTime);
IPage<Engineering> pageList = engineeringService.getPageList(page, wrapper);
return Result.success(pageList);
}
@ -73,7 +74,8 @@ public class EntEngineeringController {
@PostMapping(value = "/list")
public Result<List<Engineering>> list(@ApiIgnore @RequestBody Engineering engineering) {
QueryWrapper<Engineering> queryWrapper = QueryGenerator.initQueryWrapper(engineering);
queryWrapper.eq("examine_state", 3);
queryWrapper.lambda().eq(Engineering::getExamineState, 3);
queryWrapper.lambda().orderByDesc(Engineering::getCreateTime);
List<Engineering> engineeringList = engineeringService.list(queryWrapper);
return Result.success(engineeringList);
}

7
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLifterController.java
View File

@ -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<Object> 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 {

10
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceController.java
View File

@ -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<Object> useApply(@RequestBody LiftingDeviceUse liftingDeviceUse) {
public Result<Object> useApply(@RequestBody LiftingDeviceUseVo liftingDeviceUse) {
Result<Object> result = new Result<Object>();
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) {

28
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntLiftingDeviceUseController.java
View File

@ -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<List<AnnexFile>> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceUse liftingDeviceUse) {
Result<List<AnnexFile>> result = new Result<List<AnnexFile>>();
LiftingDeviceUse liftingDeviceUseEntity = liftingDeviceUseService.getById(liftingDeviceUse.getId());
if (liftingDeviceUseEntity == null) {
result.error500("未找到对应实体");
} else {
result.setResult(annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, liftingDeviceUse.getId())
.eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue())));
result.setSuccess(true);
}
return result;
}
}

10
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTowerCraneController.java
View File

@ -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<Object> 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 {

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterAlarmController.java
View File

@ -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<LifterAlarm> pageList = lifterAlarmService.page(page, queryWrapper);
return Result.success(pageList);
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLifterCurrentDataController.java
View File

@ -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<LifterCurrentData> pageList = lifterCurrentDataService.page(page, queryWrapper);
return Result.success(pageList);
}

34
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java
View File

@ -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<IPage<LiftingDevice>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<LiftingDevice> queryWrapper = QueryGenerator.initPageQueryWrapper(LiftingDevice.class, map);
Page<LiftingDevice> 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<LiftingDevice> 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<LiftingDeviceVo> queryDetailById(@ApiIgnore @RequestBody LiftingDevice liftingDeviceEntity) {
Result<LiftingDeviceVo> result = new Result<LiftingDeviceVo>();
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<Object> examine(@RequestBody LiftingDeviceExamineVo liftingDeviceExamineVo) {
Result<Object> result = new Result<Object>();
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;
}
}

21
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceExamineController.java
View File

@ -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<LiftingDeviceExamine> 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<List<AnnexFile>> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceExamine liftingDeviceExamine) {
Result<List<AnnexFile>> result = new Result<List<AnnexFile>>();
LiftingDeviceExamine liftingDeviceExamineEntity = liftingDeviceExamineService.getById(liftingDeviceExamine.getId());
if (liftingDeviceExamineEntity == null) {
result.error500("未找到对应实体");
} else {
result.setResult(liftingDeviceExamineService.queryAnnexFile(liftingDeviceExamine.getId()));
result.setSuccess(true);
}
return result;
}
}

23
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceUseController.java
View File

@ -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<List<AnnexFile>> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceUse liftingDeviceUse) {
Result<List<AnnexFile>> result = new Result<List<AnnexFile>>();
LiftingDeviceUse liftingDeviceUseEntity = liftingDeviceUseService.getById(liftingDeviceUse.getId());
if (liftingDeviceUseEntity == null) {
result.error500("未找到对应实体");
} else {
result.setResult(annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, liftingDeviceUse.getId())
.eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue())));
result.setSuccess(true);
}
return result;
}
}

7
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LifterController.java
View File

@ -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<Object> 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 {

28
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/LiftingDeviceUseController.java
View File

@ -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<List<AnnexFile>> queryAnnexFile(@ApiIgnore @RequestBody LiftingDeviceUse liftingDeviceUse) {
Result<List<AnnexFile>> result = new Result<List<AnnexFile>>();
LiftingDeviceUse liftingDeviceUseEntity = liftingDeviceUseService.getById(liftingDeviceUse.getId());
if (liftingDeviceUseEntity == null) {
result.error500("未找到对应实体");
} else {
result.setResult(annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, liftingDeviceUse.getId())
.eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_USE.getValue())));
result.setSuccess(true);
}
return result;
}
}

7
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/TowerCraneController.java
View File

@ -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<Object> 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 {

4
src/main/java/com/zhgd/xmgl/modules/quality/service/ICheckAcceptPlanService.java
View File

@ -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<CheckAcceptPlan> {
Page<CheckAcceptPlan> pageList(Page page, Wrapper<CheckAcceptPlan> wrapper);
Page<CheckAcceptPlan> pageList(Page page, QueryWrapper<CheckAcceptPlan> wrapper);
Page<CheckAcceptPlanEntDto> pageListForSuperior(Map<String, Object> map);

5
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java
View File

@ -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<CheckAcceptPlanMappe
private ISystemDictDataService systemDictDataService;
@Override
public Page<CheckAcceptPlan> pageList(Page page, Wrapper<CheckAcceptPlan> wrapper) {
public Page<CheckAcceptPlan> pageList(Page page, QueryWrapper<CheckAcceptPlan> wrapper) {
wrapper.lambda().orderByDesc(CheckAcceptPlan::getCreateTime);
Page<CheckAcceptPlan> checkAcceptPlanPage = baseMapper.pageList(page, wrapper);
List<SystemDictData> systemDictData = systemDictDataService.getByType(ParamEnum.SysDictType.CHECK_ACCEPT_TYPE.getValue());
for (CheckAcceptPlan record : checkAcceptPlanPage.getRecords()) {

4
src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDevice.java
View File

@ -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：报废）
*/

2
src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceExamine.java
View File

@ -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;
/**

6
src/main/java/com/zhgd/xmgl/modules/safety/entity/LiftingDeviceUse.java
View File

@ -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;
/**

4
src/main/java/com/zhgd/xmgl/modules/safety/service/ILiftingDeviceService.java
View File

@ -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<LiftingDevice> {
boolean apply(LiftingDeviceExamineDto liftingDeviceExamineVo);
boolean useApply(LiftingDeviceUse liftingDeviceUse);
boolean useApply(LiftingDeviceUseVo liftingDeviceUse);
LiftingDeviceVo queryDetailById(Long id);
}

4
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceExamineServiceImpl.java
View File

@ -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<LiftingDeviceEx
@Override
public List<AnnexFile> queryAnnexFile(Long id) {
return annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, id));
return annexFileService.list(Wrappers.<AnnexFile>lambdaQuery().eq(AnnexFile::getRelevanceId, id)
.eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.LIFTER_DEVICE_EXAMINE));
}
}

64
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java
View File

@ -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<LiftingDeviceMapper, L
@Autowired
private IAnnexFileService annexFileService;
@Autowired
private IEngineeringService engineeringService;
@Override
public boolean saveInfo(LiftingDeviceVo liftingDeviceVo) {
SecurityUser user = SecurityUtil.getUser();
@ -59,6 +66,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
this.save(liftingDeviceVo);
List<AnnexFile> 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<LiftingDeviceMapper, L
SecurityUser user = SecurityUtil.getUser();
if (liftingDeviceExamineVo.getType() > 5) {
//安拆审批
LiftingDeviceUse liftingDeviceUse = liftingDeviceUseService.getOne(Wrappers.<LiftingDeviceUse>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.<Engineering>lambdaQuery().eq(Engineering::getEngineeringSn, liftingDeviceUse.getEngineeringSn())).getProjectSn());
} else {
updateWrapper.set(LiftingDevice::getEngineeringSn, null);
}
}
} if (liftingDeviceExamineVo.getType() == 1) {
LambdaUpdateWrapper<LiftingDeviceExamine> wrapper = Wrappers.<LiftingDeviceExamine>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<LiftingDeviceExamine> wrapper = Wrappers.<LiftingDeviceExamine>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<LiftingDeviceMapper, L
this.update(wrapper);
List<AnnexFile> 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<LiftingDeviceMapper, L
}
@Override
public boolean useApply(LiftingDeviceUse liftingDeviceUse) {
public boolean useApply(LiftingDeviceUseVo liftingDeviceUse) {
SecurityUser user = SecurityUtil.getUser();
LambdaUpdateWrapper<LiftingDevice> wrapper = Wrappers.<LiftingDevice>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<LiftingDevice> wrapper = Wrappers.<LiftingDevice>lambdaUpdate();
wrapper.set(LiftingDevice::getIdentification, liftingDeviceUse.getInstallationType());
wrapper.eq(LiftingDevice::getId, liftingDeviceUse.getDeviceId());
this.update(wrapper);
List<AnnexFile> 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<LiftingDeviceMapper, L
return equipmentType;
}
private void buildProjectInspectNumber(LiftingDeviceExamineDto liftingDeviceExamineVo) {
LiftingDevice liftingDevice = this.getById(liftingDeviceExamineVo.getDeviceId());
private void buildProjectInspectNumber(LiftingDeviceExamineVo liftingDeviceExamineVo) {
LiftingDevice liftingDevice = this.getById(liftingDeviceExamineVo.getId());
Long idss = liftingDevice.getId();
if (liftingDevice.getType() == 1) {
// 长期和零时the_nature

3
src/main/java/com/zhgd/xmgl/modules/safety/vo/LiftingDeviceExamineVo.java
View File

@ -8,6 +8,9 @@ import lombok.Data;
@ApiModel(value = "起重机械审批(VO)", description = "LiftingDeviceExamineVo")
public class LiftingDeviceExamineVo {
@ApiModelProperty(value="主键ID")
private Long id;
@ApiModelProperty(value="设备ID")
private String deviceId;

16
src/main/java/com/zhgd/xmgl/modules/safety/vo/LiftingDeviceUseVo.java Normal file
View File

@ -0,0 +1,16 @@
package com.zhgd.xmgl.modules.safety.vo;
import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile;
import com.zhgd.xmgl.modules.safety.entity.LiftingDeviceUse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel(value = "起重机械安拆(VO)", description = "LiftingDeviceUseVo")
public class LiftingDeviceUseVo extends LiftingDeviceUse {
@ApiModelProperty(value="起重机械安拆附件")
private List<AnnexFile> annexFiles;
}

10
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/LifterMapper.java
View File

@ -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> {
Lifter getByNumber(String number, String ignore);
}

1
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/TowerCraneMapper.java
View File

@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
@DataScope
public interface TowerCraneMapper extends BaseMapper<TowerCrane> {
TowerCrane getByNumber(String number, String ignore);
}

3
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/LifterMapper.xml
View File

@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.LifterMapper">
<select id="getByNumber" resultType="com.zhgd.xmgl.modules.wisdom.entity.Lifter">
SELECT * FROM lifter WHERE dev_number = #{number}
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TowerCraneMapper.xml
View File

@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneMapper">
<select id="getByNumber" resultType="com.zhgd.xmgl.modules.wisdom.entity.TowerCrane">
SELECT * FROM tower_crane WHERE dev_number = #{number}
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/ILifterService.java
View File

@ -19,4 +19,8 @@ public interface ILifterService extends IService<Lifter> {
Page<LifterEntDto> engineeringPageList(Map<String, Object> map);
Page<LifterProjectDto> projectPageList(Map<String, Object> map);
boolean saveInfo(Lifter lifter);
boolean updateInfo(Lifter lifter);
}

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/ITowerCraneService.java
View File

@ -19,4 +19,8 @@ public interface ITowerCraneService extends IService<TowerCrane> {
Page<TowerCraneEntDto> engineeringPageList(Map<String, Object> map);
Page<TowerCraneProjectDto> projectPageList(Map<String, Object> map);
boolean saveInfo(TowerCrane towerCrane);
boolean updateInfo(TowerCrane towerCrane);
}

2
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterAlarmServiceImpl.java
View File

@ -48,7 +48,7 @@ public class LifterAlarmServiceImpl extends ServiceImpl<LifterAlarmMapper, Lifte
QueryWrapper<LifterAlarm> 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<LifterAlarm> list = this.list(queryWrapper);

6
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterCurrentDataServiceImpl.java
View File

@ -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<LifterCurrentDataM
lifterCurrentData.setCreateTime(new Date());
boolean flag = this.save(lifterCurrentData);
if (flag) {
LambdaUpdateWrapper<Lifter> wrapper = Wrappers.<Lifter>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;

24
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java
View File

@ -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<LifterMapper, Lifter> 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);
}
}

2
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneAlarmServiceImpl.java
View File

@ -47,7 +47,7 @@ public class TowerCraneAlarmServiceImpl extends ServiceImpl<TowerCraneAlarmMappe
QueryWrapper<TowerCraneAlarm> 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<TowerCraneAlarm> list = this.list(queryWrapper);

24
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java
View File

@ -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<TowerCraneMapper, TowerCr
});
return towerCraneEntDtoPage;
}
@Override
public boolean saveInfo(TowerCrane towerCrane) {
TowerCrane towerCraneEntity = baseMapper.getByNumber(towerCrane.getDevNumber(), "ignoreDataScope");
if (towerCraneEntity != null) {
throw new CustomException("设备编码已存在，请重新输入！");
} else {
towerCrane.setCreateBy(SecurityUtil.getUser().getUserId());
}
return this.save(towerCrane);
}
@Override
public boolean updateInfo(TowerCrane towerCrane) {
TowerCrane towerCraneEntity = baseMapper.getByNumber(towerCrane.getDevNumber(), "ignoreDataScope");
if (towerCraneEntity != null && !towerCraneEntity.getDevNumber().equals(towerCrane.getDevNumber())) {
throw new CustomException("设备编码已存在，请重新输入！");
} else {
towerCrane.setUpdateBy(SecurityUtil.getUser().getUserId());
}
return this.updateById(towerCrane);
}
}

10
src/main/java/com/zhgd/xmgl/util/ParamEnum.java
View File

@ -11,7 +11,15 @@ public class ParamEnum {
public enum AnnexFileType {
ENGINEERING(1, "工程附件"),
NOTICE(2, "工程附件"),
POLICY(3, "政策法规附件");
POLICY(3, "政策法规附件"),
CHECK_ACCEPT_APPLY(4, "验收申请附件"),
LIFTER_DEVICE(5, "起重机械设备附件"),
LIFTER_DEVICE_EXAMINE(6, "起重机械设备审核附件"),
LIFTER_DEVICE_USE(7, "起重机械设备安拆附件");
private Integer value;
private String desc;