From 3aa0e2adff42b46e04c5e176ad6e9316fefb0c16 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Sat, 30 Mar 2024 20:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E7=A8=8B=E6=88=90=E6=9C=AC=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/background/dto/ParamDto.java | 5 ++ .../entity/screen/vo/ProCostVo.java | 4 +- .../entity/system/SystemGlobal.java | 5 ++ .../controller/DeviceController.java | 10 +++ .../controller/HumanManageController.java | 21 +++++ .../controller/TbAreaController.java | 54 ++++++++++- .../background/mapper/DeviceMapper.java | 7 ++ .../background/mapper/HumanManageMapper.java | 35 ++++++++ .../background/mapper/TbAreaMapper.java | 29 ++++++ .../background/service/DeviceService.java | 7 ++ .../background/service/HumanService.java | 21 +++++ .../background/service/TbAreaService.java | 29 ++++++ .../service/impl/DeviceServiceImpl.java | 17 ++++ .../service/impl/HumanServiceImpl.java | 81 +++++++++++++++++ .../service/impl/TbAreaServiceImpl.java | 89 ++++++++++++++++++- .../main/resources/mapper/DeviceMapper.xml | 7 ++ .../resources/mapper/HumanManageMapper.xml | 21 +++++ .../main/resources/mapper/TbAreaMapper.xml | 17 ++++ 18 files changed, 455 insertions(+), 4 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/ParamDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/ParamDto.java index e62b43f..3411723 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/ParamDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/dto/ParamDto.java @@ -50,4 +50,9 @@ public class ParamDto { @ApiModelProperty(value = "建管单位") private String orgId; + @ApiModelProperty(value = "设备id") + private String devId; + + @ApiModelProperty(value = "人员id") + private String userId; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProCostVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProCostVo.java index 8fc2ef5..f5c7ece 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProCostVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProCostVo.java @@ -19,7 +19,7 @@ public class ProCostVo { /** * 工程造价 */ - private Decimal cost; + private String cost; /** * 成本备注 */ @@ -33,6 +33,8 @@ public class ProCostVo { */ private String createTime; + private String proName; + diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java index 4abfc7f..1fa4b51 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/SystemGlobal.java @@ -90,6 +90,11 @@ public class SystemGlobal { */ public final static int HJ_TYPE=351; + /** + * 安全帽的类型 + */ + public final static int AQM_TYPE=1804; + public final static int WEEK_DAY=7; } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java index 9f38845..aa2ab48 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DeviceController.java @@ -95,4 +95,14 @@ public class DeviceController extends BaseController { return service.getDeviceDetail(dto); } + + /** + * 查询安全帽的集合 + * @param dto + * @return + */ + @GetMapping("getDeviceListByType") + public Result> getDeviceListByType(DeviceDto dto) { + return service.getDeviceListByType(dto); + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java index 2e36764..2df5ea9 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java @@ -93,4 +93,25 @@ public class HumanManageController extends BaseController { list = service.getPersonnelAccessLists(dto); return getDataTable(list); } + + @ApiOperation(value = "绑定安全帽") + @GetMapping("bindDev") + @Log(title = "人员管理", menu = "人车管理->人员管理", grade = OperationType.ADD_BUSINESS, details = "绑定安全膜", type = "业务日志") + public AjaxResult bindDev(ParamDto dto) { + return service.bindDev(dto); + } + + @ApiOperation(value = "查看绑定安全帽") + @GetMapping("getBindDetail") + public AjaxResult getBindDetail(ParamDto dto) { + return service.getBindDetail(dto); + } + + @ApiOperation(value = "") + @GetMapping("delBind") + @Log(title = "delBind", menu = "人车管理->人员管理", grade = OperationType.ADD_BUSINESS, details = "绑定安全膜", type = "业务日志") + public AjaxResult delBind(ParamDto dto) { + return service.delBind(dto); + } + } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java index 4336825..38eb748 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TbAreaController.java @@ -16,6 +16,7 @@ import com.securitycontrol.entity.background.vo.DeviceVo; import com.securitycontrol.entity.background.vo.EmergencyPlanVo; import com.securitycontrol.entity.background.vo.GtVo; import com.securitycontrol.entity.file.FileExportVo; +import com.securitycontrol.entity.screen.vo.ProCostVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -41,9 +42,55 @@ public class TbAreaController extends BaseController { @Autowired private TbAreaService service; - @Autowired - private EmergencyService emergencyService; + @ApiOperation(value = "查询工程成本") + @GetMapping("getProCostList") + @Log(title = "工程管理", menu = "基础管理->工程管理", grade = OperationType.QUERY_BUSINESS, details = "查询工程成本", type = "业务日志") + public TableDataInfo getProCostList(AreaDto dto) { + try{ + startPage(); + List list = service.getProCostList(dto); + return getDataTable(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBad(new ArrayList<>(),"请求出错了"); + } + } + + /** + * 新增成本 + * + * @param dto + * @return + */ + @PostMapping("addCost") + @Log(title = "工程管理", menu = "基础管理->工程管理", grade = OperationType.ADD_BUSINESS, details = "新增成本", type = "业务日志") + public Result addCost(@RequestBody ProCostVo dto) { + return service.addCost(dto); + } + + /** + * 修改成本 + * + * @param dto + * @return + */ + @PostMapping("updateCost") + @Log(title = "工程管理", menu = "基础管理->工程管理", grade = OperationType.ADD_BUSINESS, details = "修改成本", type = "业务日志") + public Result updateCost(@RequestBody ProCostVo dto) { + return service.updateCost(dto); + } + + /** + * 删除维护成本 + * @param dto + * @return + */ + @PostMapping("deleteCost") + @Log(title = "工程管理", menu = "基础管理->工程管理", grade = OperationType.ADD_BUSINESS, details = "删除成本", type = "业务日志") + public Result deleteCost(@RequestBody ProCostVo dto) { + return service.deleteCost(dto); + } @ApiOperation(value = "获取设备列表") @GetMapping("getAreaList") @@ -196,4 +243,7 @@ public class TbAreaController extends BaseController { } + + + } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java index 88203cd..7a2d98e 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/DeviceMapper.java @@ -57,4 +57,11 @@ public interface DeviceMapper { * @return */ DeviceVo getDeviceDetail(DeviceDto dto); + + /** + * 查询安全帽下拉选 + * @param code + * @return + */ + List getDeviceListByType(@Param("code") int code); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java index 6718b17..2ca6e40 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java @@ -112,4 +112,39 @@ public interface HumanManageMapper { * @date 2024/3/22 9:33 */ List getPersonnelAccessLists(ParamDto dto); + + /** + * 绑定安全帽 + * @param dto + * @return + */ + int bindDev(ParamDto dto); + + /** + * 接触安全帽绑定 + * @param dto + * @return + */ + int delBind(ParamDto dto); + + /** + * 查询绑定记录 + * @param dto + * @return + */ + int getBindHis(ParamDto dto); + + /** + * 查询已绑定设备 + * @param dto + * @return + */ + List getBindDetail(ParamDto dto); + + /** + * 修改成功 + * @param dto + * @return + */ + int updateDev(ParamDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java index ac8653e..8bc8e18 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TbAreaMapper.java @@ -3,6 +3,7 @@ package com.securitycontrol.background.mapper; import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.vo.AreaVo; import com.securitycontrol.entity.background.vo.GtVo; +import com.securitycontrol.entity.screen.vo.ProCostVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -118,4 +119,32 @@ public interface TbAreaMapper { * @return */ int deleteData(AreaVo dto); + + /** + * 查询工程成本信息 + * @param dto + * @return + */ + List getProCostList(AreaDto dto); + + /** + * 新增成本 + * @param dto + * @return + */ + int addCost(ProCostVo dto); + + /** + * 修改工程成本 + * @param dto + * @return + */ + int updateCost(ProCostVo dto); + + /** + * 删除成本数据 + * @param dto + * @return + */ + int deleteCost(ProCostVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java index a552bfb..d9b0acd 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/DeviceService.java @@ -47,4 +47,11 @@ public interface DeviceService { * @return */ Result getDeviceDetail(DeviceDto dto); + + /** + * 查询安全帽的集合 + * @param dto + * @return + */ + Result> getDeviceListByType(DeviceDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java index be13a30..16f5224 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java @@ -81,4 +81,25 @@ public interface HumanService { * @date 2024/3/22 9:33 */ List getPersonnelAccessLists(ParamDto dto); + + /** + * 人员绑定安全膜 + * @param dto + * @return + */ + AjaxResult bindDev(ParamDto dto); + + /** + * 接触绑定 + * @param dto + * @return + */ + AjaxResult delBind(ParamDto dto); + + /** + * 人员绑定安全帽记录 + * @param dto + * @return + */ + AjaxResult getBindDetail(ParamDto dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java index 33e6d28..174e840 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TbAreaService.java @@ -5,6 +5,7 @@ import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.vo.AreaVo; import com.securitycontrol.entity.background.vo.GtVo; +import com.securitycontrol.entity.screen.vo.ProCostVo; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -114,4 +115,32 @@ public interface TbAreaService { * @return */ Result deleteSwFile( AreaVo dto); + + /** + * 分页查询工程成本信息 + * @param dto + * @return + */ + List getProCostList(AreaDto dto); + + /** + * 新增工程成本 + * @param dto + * @return + */ + Result addCost(ProCostVo dto); + + /** + * 修改工程成本 + * @param dto + * @return + */ + Result updateCost(ProCostVo dto); + + /** + * 删除成本数据 + * @param dto + * @return + */ + Result deleteCost(ProCostVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java index 00097da..a27a635 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceServiceImpl.java @@ -16,6 +16,7 @@ import org.apache.poi.xssf.model.SingleXmlCells; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -129,6 +130,22 @@ public class DeviceServiceImpl implements DeviceService { return Result.ok(new DeviceVo()); } + /** + * + * @param dto + * @return + */ + @Override + public Result> getDeviceListByType(DeviceDto dto) { + try{ + List list= mapper.getDeviceListByType(SystemGlobal.AQM_TYPE); + return Result.ok(list); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail(new ArrayList()); + } + + } public String checkData(DeviceVo deviceVo){ try{ diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java index 9049ef3..8ca617d 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java @@ -10,12 +10,15 @@ import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.utils.StringUtils; import com.securitycontrol.common.core.utils.aes.AesCbcUtils; import com.securitycontrol.common.core.utils.aes.DateTimeHelper; +import com.securitycontrol.common.core.utils.aes.ListHelper; +import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.security.utils.ValidatorsUtils; import com.securitycontrol.entity.background.dto.ParamDto; import com.securitycontrol.entity.background.vo.HumanManageVo; import com.securitycontrol.entity.background.vo.UserAccessVo; +import com.securitycontrol.entity.system.SystemGlobal; import com.securitycontrol.entity.system.vo.ResourceFileVo; import com.securitycontrol.system.api.RemoteFileService; import com.securitycontrol.system.api.domain.SysFile; @@ -253,4 +256,82 @@ public class HumanServiceImpl implements HumanService { } return list; } + + /** + * 人员绑定安全膜 + * @param dto + * @return + */ + @Override + public AjaxResult bindDev(ParamDto dto) { + try{ + if (StringHelper.isEmpty(dto.getUserId())) { + AjaxResult.error("未选择人员"); + } + if (StringHelper.isEmpty(dto.getDevId())) { + AjaxResult.error("未选择安全帽"); + } + if(StringHelper.isEmpty(dto.getId())){ + int bidNum=mapper.getBindHis(dto); + dto.setId(IdUtils.getUUId()); + if(bidNum>SystemGlobal.MIN_NUM){ + return AjaxResult.error("该人员已绑定安全帽"); + } + int num= mapper.bindDev(dto); + if(num== SystemGlobal.SUCCESS_NUM){ + return AjaxResult.success("绑定成功"); + } + }else{ + int num= mapper.updateDev(dto); + if(num== SystemGlobal.SUCCESS_NUM){ + return AjaxResult.success("修改成功"); + } + + } + + + + + return AjaxResult.error("绑定失败,数据未入库"); + } catch (Exception e) { + log.error(e.toString(),e); + return AjaxResult.error("系统升级中,请稍后重试"); + } + } + + /** + * + * @param dto + * @return + */ + @Override + public AjaxResult delBind(ParamDto dto) { + try{ + if (StringHelper.isEmpty(dto.getUserId())) { + AjaxResult.error("人员不能为空"); + } + int num= mapper.delBind(dto); + if(num>SystemGlobal.MIN_NUM){ + return AjaxResult.success("解除绑定成功"); + } + return AjaxResult.error("解除绑定失败"); + } catch (Exception e) { + log.error(e.toString(),e); + return AjaxResult.error("系统升级中,请稍后重试"); + } + } + + @Override + public AjaxResult getBindDetail(ParamDto dto) { + try{ + List list=mapper.getBindDetail(dto); + if(ListHelper.isNotEmpty(list)){ + return AjaxResult.success("请求成功",list.get(0)); + } + return AjaxResult.success("未绑定球机",""); + } catch (Exception e) { + log.error(e.toString(),e); + } + return AjaxResult.success("error",""); + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java index f0bd894..791559f 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TbAreaServiceImpl.java @@ -5,6 +5,7 @@ import com.securitycontrol.background.service.SourceFileService; import com.securitycontrol.background.service.TbAreaService; import com.securitycontrol.common.core.constant.SecurityConstants; import com.securitycontrol.common.core.domain.Result; +import com.securitycontrol.common.core.utils.aes.DateTimeHelper; import com.securitycontrol.common.core.utils.aes.ListHelper; import com.securitycontrol.common.core.utils.aes.StringHelper; import com.securitycontrol.common.core.utils.uuid.IdUtils; @@ -12,6 +13,7 @@ import com.securitycontrol.entity.background.dto.AreaDto; import com.securitycontrol.entity.background.vo.AreaVo; import com.securitycontrol.entity.background.vo.GtVo; import com.securitycontrol.entity.file.FileExportVo; +import com.securitycontrol.entity.screen.vo.ProCostVo; import com.securitycontrol.entity.system.SystemGlobal; import com.securitycontrol.system.api.RemoteFileService; import lombok.extern.slf4j.Slf4j; @@ -315,13 +317,98 @@ public class TbAreaServiceImpl implements TbAreaService { if (num==SystemGlobal.SUCCESS_NUM){ return Result.ok("删除成功","删除成功"); } - return Result.fail("删除失败，删除失败"); + return Result.fail("删除失败"); }catch (Exception e){ log.error(e.toString(),e); return Result.fail("系统升级中,请稍后重试!"); } } + /** + * 查询工程成本列表 + * @param dto + * @return + */ + @Override + public List getProCostList(AreaDto dto) { + return mapper.getProCostList(dto); + } + + /** + * 新增工程成本 + * @param dto + * @return + */ + @Override + public Result addCost(ProCostVo dto) { + try{ + String result=checkData3(dto); + if(StringHelper.isNotEmpty(result)){ + return Result.fail(result); + } + dto.setCurryDay(DateTimeHelper.getNowDay()); + int num= mapper.addCost(dto); + if(num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("新增成功","新增成功"); + } + return Result.fail("新增失败,数据未入库"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试!"); + } + } + + @Override + public Result updateCost(ProCostVo dto) { + try{ + String result=checkData3(dto); + if(StringHelper.isNotEmpty(result)){ + return Result.fail(result); + } + dto.setCurryDay(DateTimeHelper.getNowDay()); + int num= mapper.updateCost(dto); + if(num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("修改成功","修改成功"); + } + return Result.fail("修改失败,数据不存在"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试!"); + } + } + + @Override + public Result deleteCost(ProCostVo dto) { + try{ + int num= mapper.deleteCost(dto); + if (num==SystemGlobal.SUCCESS_NUM){ + return Result.ok("删除成功","删除成功"); + } + return Result.fail("删除失败"); + }catch (Exception e){ + log.error(e.toString(),e); + return Result.fail("系统升级中,请稍后重试!"); + } + } + + /** + * 数据校验 + * @param dto + * @return + */ + public String checkData3(ProCostVo dto){ + if(StringHelper.isEmpty(dto.getRemark())){ + return "支出项不能为空"; + } + if(StringHelper.isEmpty(dto.getBidCode())){ + return "未选择工程"; + } + if(StringHelper.isEmpty(dto.getCost())){ + return "支出成本不能为空"; + } + return null; + } + /** * 数据校验 * @param dto diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml index 9421a32..f79b4dd 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceMapper.xml @@ -85,4 +85,11 @@ where td.device_id=#{deviceId} + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml index b448c5d..2e69712 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml @@ -67,6 +67,10 @@ #{updateTime}, + + insert tb_user_bind_cap(id,people_id,device_id,bind_time,bind_status) + value ( #{id},#{userId},#{devId},now(),1 ) + DELETE FROM tb_resource_file WHERE file_id = #{fileId} @@ -75,6 +79,12 @@ DELETE FROM t_team_people WHERE user_id = #{id} + + update tb_user_bind_cap set bind_status=0 where people_id=#{userId} + + + update tb_user_bind_cap set device_id=#{devId} where id=#{id} + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml index 381398b..5ba6047 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TbAreaMapper.xml @@ -28,6 +28,10 @@ insert into tb_sw_source (bid_code,gt_id,del_flag) value (#{bidCode},#{gtId},0) + + + insert into tb_project_cost (bid_code,cost,remark,curry_day,create_time) value (#{bidCode},#{cost},#{remark},#{curryDay},now()) + update tb_area set area_name=#{areaName},bid_code=#{bidCode},remarks=#{remarks},gt_id=#{gtId}, area_code=#{areaCode},update_time=now(),area_type=#{areaType} @@ -43,9 +47,15 @@ update t_pro_gt set del_flag=1 where gt_id=#{gtId} + + update tb_project_cost set remark=#{remark} , curry_day=#{curryDay},cost=#{cost} where id=#{id} + delete from tb_sw_source where id=#{id} + + delete from tb_project_cost where id=#{id} + + + \ No newline at end of file