diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java index a363a8f..4ec5fbf 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java @@ -94,5 +94,28 @@ public class TbBdDeviceRecordController extends BaseController { return tbBdDeviceRecordService.deleteByPrimaryKey(id); } + /** + * 根据工程id查询杆塔 + * @param tbBdDeviceVo + * @return + */ + @GetMapping("/getPowerList") + public TableDataInfo getPowerList(TbBdDeviceVo tbBdDeviceVo) { + List list = tbBdDeviceRecordService.getPowerList(tbBdDeviceVo); + return getDataTable(list); + } + + /** + * 根据id修改绑定的杆塔 + * @param record + * @return + */ + @PostMapping("/updatePowerId") + public AjaxResult updatePowerId(@RequestBody @NotNull(message = "参数不能为空") @Valid TbBdDeviceRecord record) { + return toAjax(tbBdDeviceRecordService.updatePowerId(record)); + } + + + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdDeviceRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdDeviceRecord.java index 8bb6a14..2a2d0e8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdDeviceRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdDeviceRecord.java @@ -95,5 +95,17 @@ public class TbBdDeviceRecord implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date auditTime; + /** + * 杆塔id + */ + @ApiModelProperty(value="杆塔id") + private Long powerId; + + /** + * 杆塔名称 + */ + @ApiModelProperty(value="杆塔名称") + private Long powerName; + private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbBdDeviceRecordMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbBdDeviceRecordMapper.java index aae07d1..0d1fd7a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbBdDeviceRecordMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbBdDeviceRecordMapper.java @@ -52,4 +52,8 @@ public interface TbBdDeviceRecordMapper { int deleteById(Long id); int queryByDeviceId(Long id); -} \ No newline at end of file + + List getPowerList(TbBdDeviceVo tbBdDeviceVo); + + int updatePowerId(TbBdDeviceRecord record); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdDeviceRecordService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdDeviceRecordService.java index 4bee101..fa88c61 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdDeviceRecordService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdDeviceRecordService.java @@ -40,4 +40,8 @@ public interface TbBdDeviceRecordService{ * @return */ List getDeviceList(TbBdDeviceVo tbBdDeviceVo); - } + + List getPowerList(TbBdDeviceVo tbBdDeviceVo); + + int updatePowerId(TbBdDeviceRecord record); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdDeviceRecordServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdDeviceRecordServiceImpl.java index 963b8b2..85ca018 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdDeviceRecordServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdDeviceRecordServiceImpl.java @@ -91,5 +91,15 @@ public class TbBdDeviceRecordServiceImpl implements TbBdDeviceRecordService{ return deviceList; } + @Override + public List getPowerList(TbBdDeviceVo tbBdDeviceVo) { + return tbBdDeviceRecordMapper.getPowerList(tbBdDeviceVo); + } + + @Override + public int updatePowerId(TbBdDeviceRecord record) { + return tbBdDeviceRecordMapper.updatePowerId(record); + } + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbBdDeviceVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbBdDeviceVo.java index 4c7e333..6c73bd8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbBdDeviceVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbBdDeviceVo.java @@ -74,5 +74,27 @@ public class TbBdDeviceVo { @ApiModelProperty(value="负责人电话-sm4加密") private String devUserPhone; + /** + * 杆塔id + */ + @ApiModelProperty(value="杆塔id") + private String powerId; + /** + * 杆塔名称 + */ + @ApiModelProperty(value="杆塔名称") + private String powerName; + + /** + * 项目类型 + */ + @ApiModelProperty(value="项目类型") + private String proType; + + /** + * 项目类型 + */ + @ApiModelProperty(value="绑定id") + private String bindId; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java index d7ba1d2..06a80af 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java @@ -1,5 +1,6 @@ package com.bonus.screen.controller; +import com.bonus.base.domain.TbBdDeviceRecord; import com.bonus.base.domain.TbDevice; import com.bonus.base.service.TbUserPostService; import com.bonus.common.core.web.controller.BaseController; @@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -142,6 +145,16 @@ public class ProjectViewTwoController extends BaseController { return getDataTable(list); } + /** + * 根据工程id获取大屏首页地图工程信息 + * @param record + * @return + */ + @GetMapping("/getProjectAndDeviceById") + public AjaxResult getProjectAndDeviceById(DeviceNumByProjectVo record) { + return success(projectViewService.getProjectAndDeviceById(record)); + } + // /** // * 感知设备数量 diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/DeviceNumByProjectMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/DeviceNumByProjectMapper.java new file mode 100644 index 0000000..d05f28f --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/DeviceNumByProjectMapper.java @@ -0,0 +1,19 @@ +package com.bonus.screen.mapper; + +import com.bonus.screen.vo.DeviceNumByProjectVo; +import com.bonus.screen.vo.UserPost; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface DeviceNumByProjectMapper { + + /** + * 根据工程id获取大屏首页地图工程信息 + * @param record + * @return + */ + DeviceNumByProjectVo getProjectAndDeviceById(DeviceNumByProjectVo record); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java index c8203aa..dda2f14 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java @@ -12,6 +12,7 @@ import com.bonus.base.mapper.TbTeamMapper; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.screen.mapper.DeviceNumByProjectMapper; import com.bonus.screen.mapper.TbDeviceDataRecord; import com.bonus.screen.mapper.TeamRecordMapper; import com.bonus.screen.mapper.UserPostMapper; @@ -50,6 +51,9 @@ public class ProjectViewServiceImpl { @Autowired private UserPostMapper userPost; + @Autowired + private DeviceNumByProjectMapper deviceNumByProjectMapper; + public ProjectViewVo getProjectView() { return tbProjectMapper.getProjectView( ProjectTypeEnum.PROJECT_TYPE_POWER.getCode(), @@ -267,4 +271,12 @@ public class ProjectViewServiceImpl { }); return list; } + + /** + * 根据工程id获取大屏首页地图工程信息 + * @return + */ + public DeviceNumByProjectVo getProjectAndDeviceById(DeviceNumByProjectVo record) { + return deviceNumByProjectMapper.getProjectAndDeviceById(record); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceNumByProjectVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceNumByProjectVo.java new file mode 100644 index 0000000..df81a94 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/DeviceNumByProjectVo.java @@ -0,0 +1,52 @@ +package com.bonus.screen.vo; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@ApiModel(description="设备表,边代记录表") +@Data +public class DeviceNumByProjectVo implements Serializable { + + + /** + * 工程id + */ + private Long proId; + + /** + * 工程名称 + */ + @ApiModelProperty(value="工程名称") + private String proName; + + /** + * 感知设备类型数 + */ + @ApiModelProperty(value="感知设备类型数") + private Integer devTypeNum; + + /** + * 感知设备数量 + */ + @ApiModelProperty(value="感知设备数量") + private Integer devNum; + + /** + * 设备正常数量 + */ + @ApiModelProperty(value="设备正常数量") + private Integer successNum; + + /** + * 设备异常数量 + */ + @ApiModelProperty(value="设备异常数量") + private Integer errorNum; + + + private static final long serialVersionUID = 1L; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java index 0cc04f1..4244c99 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java @@ -15,31 +15,31 @@ public class TeamRecordNum implements Serializable { /** * 施工班组数 */ - @Excel(name = "施工班组数") + @ApiModelProperty(value="施工班组数") private Integer teamNum; /** * 施工人员数 */ - @Excel(name = "施工人员数") + @ApiModelProperty(value="施工人员数") private Integer peopleNum; /** * 班组骨干 */ - @Excel(name = "班组骨干") + @ApiModelProperty(value="班组骨干") private Integer teamMaster; /** * 一般作业 */ - @Excel(name = "一般作业") + @ApiModelProperty(value="一般作业") private Integer teamSame; /** * 特种作业 */ - @Excel(name = "特种作业") + @ApiModelProperty(value="特种作业") private Integer teamSpecial; } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml index 4d9e63d..ea74d77 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml @@ -190,6 +190,12 @@ where record_id = #{id} + + update tb_bd_device_record + set power_id = #{powerId} + where id = #{id} + + delete from tb_bd_device_record where id in @@ -229,6 +235,8 @@ b.depart_id as departId, b.depart_name as departName, b.pro_id as proId, + tp.pro_type as proType, + a.power_id as bindId, b.pro_name as proName, a.area_name as areaName, a.dev_name as devName, @@ -236,7 +244,9 @@ a.dev_user as devUser, a.dev_user_phone as devUserPhone from tb_bd_device_record a + left join tb_bd_record b on a.record_id = b.id and b.del_flag = '0' + left join tb_project tp on b.pro_id = tp.id where b.audit_status = 1 @@ -271,4 +281,17 @@ select count(1) from tb_device where del_flag = 0 and bd_id = #{id} + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/DeviceNumByProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/DeviceNumByProjectMapper.xml new file mode 100644 index 0000000..25a5ae6 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/DeviceNumByProjectMapper.xml @@ -0,0 +1,23 @@ + + + + + + + +