diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java index 6c7d58e..36f1bef 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDeviceMapper.java @@ -4,8 +4,8 @@ import com.bonus.base.config.DeviceTypeEnum; import com.bonus.base.domain.TbDevice; import com.bonus.screen.vo.DeviceViewVo; import com.bonus.screen.vo.DeviceWarnRecordVo; +import com.bonus.screen.vo.TbBdDeviceRecordTwo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -68,6 +68,8 @@ public interface TbDeviceMapper { DeviceViewVo getDeviceView(); + DeviceViewVo getBdDeviceView(); + DeviceViewVo getSensingDevice(DeviceTypeEnum baseSafetyHat, DeviceTypeEnum baseEnvironmentMonitor, DeviceTypeEnum basePitMonitor, @@ -83,4 +85,12 @@ public interface TbDeviceMapper { * @return */ int getById(Long id); -} \ No newline at end of file + + /** + * 左侧物联边缘代理总设备详情 + * @param bdData + * @return + */ + List getDeviceModelDataAll(TbBdDeviceRecordTwo bdData); +} + diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java index a6fd202..780f731 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewController.java @@ -9,6 +9,7 @@ import com.bonus.screen.domain.ScreenDeskConfig; import com.bonus.screen.service.ScreenDeskConfigService; import com.bonus.screen.service.impl.ProjectViewServiceImpl; import com.bonus.screen.vo.DeviceWarnRecordVo; +import com.bonus.screen.vo.WarnPredictionRecordVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; 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 new file mode 100644 index 0000000..d7ba1d2 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectViewTwoController.java @@ -0,0 +1,177 @@ +package com.bonus.screen.controller; + +import com.bonus.base.domain.TbDevice; +import com.bonus.base.service.TbUserPostService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.screen.service.ScreenDeskConfigService; +import com.bonus.screen.service.impl.ProjectViewServiceImpl; +import com.bonus.screen.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @model 工程模块by工作台 + */ +@RestController +@RequestMapping("/screen/homeTwo") +public class ProjectViewTwoController extends BaseController { + + @Autowired + private ProjectViewServiceImpl projectViewService; + + @Resource + private TbUserPostService tbUserPostService; + + @Resource + private ScreenDeskConfigService screenDeskConfigService; + + + /** + * 左侧物联边缘代理数量 + * @return + */ + @GetMapping("/getDeviceModelDataAmount") + public AjaxResult getDeviceModelDataAmount() { + return success(projectViewService.getBdDeviceMapper()); + } + + /** + * 左侧物联边缘代理总设备详情/在线设备详情 + * @return + */ + @GetMapping("/getDeviceModelDataAll") + public TableDataInfo getDeviceModelDataAll(TbBdDeviceRecordTwo bdData) { + startPage(); + List list = projectViewService.getDeviceModelDataAll(bdData); + return getDataTable(list); + } + + /** + * 安全隐患预测记录信息 + * @param record + * @return + */ + @GetMapping("/getWarnPredictionRecord") + public AjaxResult getWarnPredictionRecord(WarnPredictionRecordVo record) { + return success(projectViewService.getWarnPredictionRecord(record)); + } + + /** + * 安全隐患预测记录所有信息 + * @param record + * @return + */ + @GetMapping("/getWarnPredictionRecordAll") + public TableDataInfo getWarnPredictionRecordAll(WarnPredictionRecordVo record) { + startPage(); + List list = projectViewService.getWarnPredictionRecord(record); + return getDataTable(list); + } + + /** + * 施工记录数量 + * @return + */ + @GetMapping("/getTeamDataAmount") + public AjaxResult getTeamDataAmount() { + return success(projectViewService.getTeamDataAmount()); + } + + /** + * 施工班组详情页 + * @param record + * @return + */ + @GetMapping("/getTeamDetails") + public TableDataInfo getTeamDetails(TeamRecord record) { + startPage(); + List list = projectViewService.getTeamDetails(record); + return getDataTable(list); + } + + /** + * 施工人员详情页 + * @param record + * @return + */ + @GetMapping("/getTeamPeopleDetails") + public TableDataInfo getTeamPeopleDetails(TeamRecord record) { + startPage(); + List list = projectViewService.getTeamPeopleDetails(record); + return getDataTable(list); + } + + /** + * 施工人员-班组骨干详情页 + * @param record + * @return + */ + @GetMapping("/getTeamMasterDetails") + public TableDataInfo getTeamMasterDetails(TeamRecord record) { + startPage(); + List list = projectViewService.getTeamMasterDetails(record); + return getDataTable(list); + } + + /** + * 人员到岗到位页面 + * @param record + * @return + */ + @GetMapping("/getUserPostDetails") + public AjaxResult getUserPostDetails(UserPost record) { + return success(projectViewService.getUserPostDetails(record)); + } + + /** + * 人员到岗到位所有页面 + * @param record + * @return + */ + @GetMapping("/getUserPostDetailsAll") + public TableDataInfo getUserPostDetailsAl(UserPost record) { + startPage(); + List list = projectViewService.getUserPostDetails(record); + return getDataTable(list); + } + + +// /** +// * 感知设备数量 +// * @return +// */ +// @GetMapping("/getSensingDeviceModelData") +// public AjaxResult getSensingDeviceModelData() { +// return success(projectViewService.getSensingDevice()); +// } + +// /** +// * 感知设备各部分详情页 +// * @param tbDevice +// * @return +// */ +// @GetMapping("/getDeviceModelDetailsPagePart") +// public TableDataInfo getDeviceModelDetailsPagePart(TbDevice tbDevice) { +// startPage(); +// List list = projectViewService.getDeviceModelDetailsPage(tbDevice); +// return getDataTable(list); +// } + +// /** +// * 左侧工程信息数量 +// * @return +// */ +// @GetMapping("/getProjectModelDataAll") +// public AjaxResult getProjectModelDataAll() { +// return success(projectViewService.getProjectView()); +// } + + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java index 609c8c6..df2c0b0 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java @@ -3,6 +3,7 @@ package com.bonus.screen.mapper; import com.bonus.base.domain.TbDevAttribute; import com.bonus.data.entity.DevAttributeVo; import com.bonus.screen.vo.DeviceWarnRecordVo; +import com.bonus.screen.vo.WarnPredictionRecordVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,6 +22,13 @@ public interface TbDeviceDataRecord { List> queryDevInfoByProject(@Param("proId") Integer proId, @Param("devType") Integer devType); + /** + * 安全隐患预测记录信息 + * @param record + * @return + */ + List getWarnPredictionRecord(WarnPredictionRecordVo record); + List getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo); /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java new file mode 100644 index 0000000..f1523d2 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java @@ -0,0 +1,40 @@ +package com.bonus.screen.mapper; + +import com.bonus.screen.vo.TeamRecord; +import com.bonus.screen.vo.TeamRecordNum; +import com.bonus.screen.vo.WarnPredictionRecordVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface TeamRecordMapper { + + /** + * 施工记录数量 + * @return + */ + TeamRecordNum getTeamDataAmount(); + + /** + * 施工班组详情页 + * @param record + * @return + */ + List getTeamDetails(TeamRecord record); + + /** + * 施工人员详情页 + * @param record + * @return + */ + List getTeamPeopleDetails(TeamRecord record); + + /** + * 施工人员-班组骨干详情页 + * @param record + * @return + */ + List getTeamMasterDetails(TeamRecord record); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/UserPostMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/UserPostMapper.java new file mode 100644 index 0000000..f6adeb9 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/UserPostMapper.java @@ -0,0 +1,19 @@ +package com.bonus.screen.mapper; + +import com.bonus.screen.vo.TeamRecord; +import com.bonus.screen.vo.UserPost; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface UserPostMapper { + + /** + * 人员到岗到位页面 + * @param record + * @return + */ + List getUserPostDetails(UserPost 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 c1b4ec4..c8203aa 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 @@ -9,16 +9,13 @@ import com.bonus.base.mapper.TbDeviceMapper; import com.bonus.base.mapper.TbProDepartMapper; import com.bonus.base.mapper.TbProjectMapper; import com.bonus.base.mapper.TbTeamMapper; -import com.bonus.base.vo.TbDeviceVo; -import com.bonus.base.vo.TbProjectVo; 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.TbDeviceDataRecord; +import com.bonus.screen.mapper.TeamRecordMapper; +import com.bonus.screen.mapper.UserPostMapper; import com.bonus.screen.vo.*; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,6 +44,12 @@ public class ProjectViewServiceImpl { @Autowired private TbTeamMapper tbTeamMapper; + @Autowired + private TeamRecordMapper teamRecord; + + @Autowired + private UserPostMapper userPost; + public ProjectViewVo getProjectView() { return tbProjectMapper.getProjectView( ProjectTypeEnum.PROJECT_TYPE_POWER.getCode(), @@ -58,6 +61,10 @@ public class ProjectViewServiceImpl { return tbDeviceMapper.getDeviceView(); } + public DeviceViewVo getBdDeviceMapper() { + return tbDeviceMapper.getBdDeviceView(); + } + public DeviceViewVo getSensingDevice() { return tbDeviceMapper.getSensingDevice( DeviceTypeEnum.BASE_SAFETY_HAT, @@ -73,6 +80,15 @@ public class ProjectViewServiceImpl { return tbDeviceDataRecord.getDeviceWarnRecord(deviceWarnRecordVo); } + /** + * 安全隐患预测记录信息 + * @param record + * @return + */ + public List getWarnPredictionRecord(WarnPredictionRecordVo record) { + return tbDeviceDataRecord.getWarnPredictionRecord(record); + } + /** * TODO：待完善 @@ -120,10 +136,24 @@ public class ProjectViewServiceImpl { } + /** + * 感知设备各部分详情页 + * @param tbDevice + * @return + */ public List getDeviceModelDetailsPage(TbDevice tbDevice) { return tbDeviceMapper.getDeviceModelDetailsPage(tbDevice); } + /** + * 左侧物联边缘代理总设备详情 + * @param bdData + * @return + */ + public List getDeviceModelDataAll(TbBdDeviceRecordTwo bdData) { + return tbDeviceMapper.getDeviceModelDataAll(bdData); + } + public AjaxResult getTeamJoinPersonListByProId(Integer proId){ List teamPersonList = tbTeamMapper.getTeamJoinPersonListByProId(proId); @@ -161,4 +191,80 @@ public class ProjectViewServiceImpl { } return null; // 如果未找到，返回 null } + + /** + * 施工记录数量 + * @return + */ + public TeamRecordNum getTeamDataAmount() { + return teamRecord.getTeamDataAmount(); + } + + /** + * 施工班组详情页 + * @param record + * @return + */ + public List getTeamDetails(TeamRecord record) { + List list = new ArrayList<>(); + list = teamRecord.getTeamDetails(record); + if(CollectionUtils.isNotEmpty(list)) + list.forEach(teamRecordOne -> { + if (StringUtils.isNotBlank(teamRecordOne.getMasterPhone())) { + teamRecordOne.setMasterPhone(Sm4Utils.decode(teamRecordOne.getMasterPhone())); + } + }); + return list; + } + + /** + * 施工人员详情页 + * @param record + * @return + */ + public List getTeamPeopleDetails(TeamRecord record) { + List list = new ArrayList<>(); + list = teamRecord.getTeamPeopleDetails(record); + if(CollectionUtils.isNotEmpty(list)) + list.forEach(teamRecordOne -> { + if (StringUtils.isNotBlank(teamRecordOne.getPhone())) { + teamRecordOne.setPhone(Sm4Utils.decode(teamRecordOne.getPhone())); + } + }); + return list; + } + + /** + * 施工人员-班组骨干详情页 + * @param record + * @return + */ + public List getTeamMasterDetails(TeamRecord record) { + List list = new ArrayList<>(); + list = teamRecord.getTeamMasterDetails(record); + if(CollectionUtils.isNotEmpty(list)) + list.forEach(teamRecordOne -> { + if (StringUtils.isNotBlank(teamRecordOne.getPhone())) { + teamRecordOne.setPhone(Sm4Utils.decode(teamRecordOne.getPhone())); + } + }); + return list; + } + + /** + * 人员到岗到位页面 + * @param record + * @return + */ + public List getUserPostDetails(UserPost record) { + List list = new ArrayList<>(); + list = userPost.getUserPostDetails(record); + if(CollectionUtils.isNotEmpty(list)) + list.forEach(userPostOne -> { + if (StringUtils.isNotBlank(userPostOne.getPhone())) { + userPostOne.setPhone(Sm4Utils.decode(userPostOne.getPhone())); + } + }); + return list; + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TbBdDeviceRecordTwo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TbBdDeviceRecordTwo.java new file mode 100644 index 0000000..eee800a --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TbBdDeviceRecordTwo.java @@ -0,0 +1,65 @@ +package com.bonus.screen.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * @PackagePath: com.bonus.base.domain + * @CreateTime: 2024-09-26 + * @Description: 边带记录设备表 + * @version : 1.0 +*/ +@ApiModel(description="边带记录设备表") +@Data +public class TbBdDeviceRecordTwo implements Serializable { + /** + * id + */ + @ApiModelProperty(value="id") + private Long id; + + /** + * 记录id + */ + @ApiModelProperty(value="记录id") + private Long recordId; + + /** + * 设备名称 + */ + @ApiModelProperty(value="设备名称") + @Size(max = 255,message = "设备名称最大长度要小于 255") + private String devName; + + /** + * 设备编码-唯一校验 + */ + @ApiModelProperty(value="设备编码-唯一校验") + @Size(max = 64,message = "设备编码-唯一校验最大长度要小于 64") + private String devCode; + + + @ApiModelProperty(value="工程id") + private Long proId; + + @ApiModelProperty(value="工程名称") + private Long proName; + + /** + * 设备状态 0 离线 1在线 + */ + @ApiModelProperty(value="设备状态 0 离线 1在线") + private Integer devStatus; + + /** + * 设备状态名称 + */ + @ApiModelProperty(value="设备状态名称") + private String devStatusName; + + private static final long serialVersionUID = 1L; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java new file mode 100644 index 0000000..ef04ea2 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java @@ -0,0 +1,74 @@ +package com.bonus.screen.vo; + +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; + +import javax.validation.constraints.Size; +import java.io.Serializable; + +@ApiModel(description="班组，人员表") +@Data +public class TeamRecord implements Serializable { + + /** + * 班组id + */ + private Long teamId; + + /** + * 班组名称 + */ + @ApiModelProperty(value="班组名称") + private String teamName; + + /** + * 班组长 + */ + @ApiModelProperty(value="班组长") + @Size(max = 50,message = "姓名最大长度要小于 50") + private String masterName; + + /** + * 人员姓名 + */ + @ApiModelProperty(value="人员姓名") + @Size(max = 50,message = "姓名最大长度要小于 50") + private String peopleName; + + /** + * 岗位工种 + */ + @ApiModelProperty(value="岗位工种") + private String postCode; + + /** + * 班组长电话 + */ + @ApiModelProperty(value="班组长电话") + @Size(max = 11,message = "电话最大长度要小于 11") + private String masterPhone; + + /** + * 手机号 + */ + @ApiModelProperty(value="手机号") + @Size(max = 11,message = "电话最大长度要小于 11") + private String phone; + + /** + * 性别 + */ + @ApiModelProperty(value="性别") + private Integer sex; + + /** + * 班组人数 + */ + @Excel(name = "班组人数") + private Integer peopleCount; + + 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 new file mode 100644 index 0000000..0cc04f1 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecordNum.java @@ -0,0 +1,45 @@ +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 javax.validation.constraints.Size; +import java.io.Serializable; + +@ApiModel(description="班组，人员表") +@Data +public class TeamRecordNum implements Serializable { + + /** + * 施工班组数 + */ + @Excel(name = "施工班组数") + private Integer teamNum; + + /** + * 施工人员数 + */ + @Excel(name = "施工人员数") + private Integer peopleNum; + + /** + * 班组骨干 + */ + @Excel(name = "班组骨干") + private Integer teamMaster; + + /** + * 一般作业 + */ + @Excel(name = "一般作业") + private Integer teamSame; + + /** + * 特种作业 + */ + @Excel(name = "特种作业") + private Integer teamSpecial; + +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/UserPost.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/UserPost.java new file mode 100644 index 0000000..a99e541 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/UserPost.java @@ -0,0 +1,62 @@ +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 javax.validation.constraints.Size; +import java.io.Serializable; + +@ApiModel(description="人员到岗到位表") +@Data +public class UserPost implements Serializable { + private static final long serialVersionUID = 935926443103754206L; + /** + * id + */ + private Long id; + + /** + * 岗位 + */ + @ApiModelProperty(value="岗位") + private String postName; + + /** + * 人员名称 + */ + @ApiModelProperty(value="人员名称") + @Size(max = 50,message = "姓名最大长度要小于 50") + private String peopleName; + + /** + * 手机号 + */ + @ApiModelProperty(value="手机号") + @Size(max = 11,message = "电话最大长度要小于 11") + private String phone; + + /** + * 岗位工种 + */ + @ApiModelProperty(value="岗位工种") + private String postCode; + + /** + * 签到时间 + */ + @ApiModelProperty(value="签到时间") + private String createTime; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + /** + * 工程id + */ + private Long proId; +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java new file mode 100644 index 0000000..968c698 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/WarnPredictionRecordVo.java @@ -0,0 +1,33 @@ +package com.bonus.screen.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @PackagePath: com.bonus.screen.vo + * @CreateTime: 2024-09-26 + * @Description: Vo + */ +@Data +public class WarnPredictionRecordVo implements Serializable { + + + @ApiModelProperty(value = "工程名称") + private String proName; + + @ApiModelProperty(value = "预警时间") + private String createTime; + + @ApiModelProperty(value = "预警内容") + private String content; + + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + +} diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml index 8b16880..d3563bd 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml @@ -231,6 +231,15 @@ where del_flag = 0 + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml index cf3e64b..65eac76 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml @@ -266,5 +266,6 @@ WHERE tt.id = #{id} + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml index f2e32f3..f4dc6d2 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml @@ -37,6 +37,23 @@ GROUP BY tddr.id + + + - \ No newline at end of file + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml new file mode 100644 index 0000000..15d8a54 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/UserPostMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/UserPostMapper.xml new file mode 100644 index 0000000..4945731 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/UserPostMapper.xml @@ -0,0 +1,26 @@ + + + + + + + +