diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java index 6f6264030..d16dbe447 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java @@ -155,7 +155,7 @@ public class ProjectEnterprise implements Serializable { @ApiModelProperty(value = "施工地图") private java.lang.String constructionMapUrl; - @ApiModelProperty(value = "承包商名称") + @ApiModelProperty(value = "承包项目名称") private java.lang.String cbsName; @ApiModelProperty(value = "项目施工区域") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzLiveScreenDanmuController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzLiveScreenDanmuController.java new file mode 100644 index 000000000..7b95db9d0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzLiveScreenDanmuController.java @@ -0,0 +1,130 @@ +package com.zhgd.xmgl.modules.xz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenDanmu; +import com.zhgd.xmgl.modules.xz.service.IXzLiveScreenDanmuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; + + +/** + * @Title: Controller + * @Description: 现场大屏弹幕 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/xzLiveScreenDanmu") +@Slf4j +@Api(tags = "现场大屏弹幕相关Api") +public class XzLiveScreenDanmuController { + @Autowired + private IXzLiveScreenDanmuService xzLiveScreenDanmuService; + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "现场大屏弹幕管理", operType = "分页查询", operDesc = "分页列表查询现场大屏弹幕信息") + @ApiOperation(value = "分页列表查询现场大屏弹幕信息", notes = "分页列表查询现场大屏弹幕信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(xzLiveScreenDanmuService.queryPageList(param)); + } + + /** + * 列表查询 + * + * @return + */ + @OperLog(operModul = "现场大屏弹幕管理", operType = "列表查询", operDesc = "列表查询现场大屏弹幕信息") + @ApiOperation(value = "列表查询现场大屏弹幕信息", notes = "列表查询现场大屏弹幕信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(xzLiveScreenDanmuService.queryList(param)); + } + + /** + * 添加 + * + * @param xzLiveScreenDanmu + * @return + */ + @OperLog(operModul = "现场大屏弹幕管理", operType = "添加", operDesc = "添加现场大屏弹幕信息") + @ApiOperation(value = "添加现场大屏弹幕信息", notes = "添加现场大屏弹幕信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate XzLiveScreenDanmu xzLiveScreenDanmu) { + xzLiveScreenDanmuService.add(xzLiveScreenDanmu); + return Result.ok(); + } + + /** + * 编辑 + * + * @param xzLiveScreenDanmu + * @return + */ + @OperLog(operModul = "现场大屏弹幕管理", operType = "编辑", operDesc = "编辑现场大屏弹幕信息") + @ApiOperation(value = "编辑现场大屏弹幕信息", notes = "编辑现场大屏弹幕信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody XzLiveScreenDanmu xzLiveScreenDanmu) { + xzLiveScreenDanmuService.edit(xzLiveScreenDanmu); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "现场大屏弹幕管理", operType = "删除", operDesc = "删除现场大屏弹幕信息") + @ApiOperation(value = "删除现场大屏弹幕信息", notes = "删除现场大屏弹幕信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "现场大屏弹幕ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + xzLiveScreenDanmuService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @OperLog(operModul = "现场大屏弹幕管理", operType = "通过id查询", operDesc = "通过id查询现场大屏弹幕信息") + @ApiOperation(value = "通过id查询现场大屏弹幕信息", notes = "通过id查询现场大屏弹幕信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "现场大屏弹幕ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + return Result.success(xzLiveScreenDanmuService.queryById(id)); + } + + @OperLog(operModul = "现场大屏弹幕管理", operType = "删除", operDesc = "保存现场大屏弹幕信息") + @ApiOperation(value = "保存现场大屏弹幕信息", notes = "保存现场大屏弹幕信息", httpMethod = "POST") + @PostMapping(value = "/saveObj") + public Result saveObj(@RequestBody XzLiveScreenDanmu xzLiveScreenDanmu) { + xzLiveScreenDanmuService.saveObj(xzLiveScreenDanmu); + return Result.ok(); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzLiveScreenProgramController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzLiveScreenProgramController.java new file mode 100644 index 000000000..9019bceb7 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzLiveScreenProgramController.java @@ -0,0 +1,119 @@ +package com.zhgd.xmgl.modules.xz.controller; + +import com.zhgd.annotation.OperLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; +import java.util.HashMap; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenProgram; +import com.zhgd.xmgl.modules.xz.service.IXzLiveScreenProgramService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 现场大屏节目单 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/xzLiveScreenProgram") +@Slf4j +@Api(tags = "现场大屏节目单相关Api") +public class XzLiveScreenProgramController { + @Autowired + private IXzLiveScreenProgramService xzLiveScreenProgramService; + + /** + * 分页列表查询 + * @return + */ + @OperLog(operModul = "现场大屏节目单管理", operType = "分页查询", operDesc = "分页列表查询现场大屏节目单信息") + @ApiOperation(value = "分页列表查询现场大屏节目单信息", notes = "分页列表查询现场大屏节目单信息", httpMethod="GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(xzLiveScreenProgramService.queryPageList(param)); + } + + /** + * 列表查询 + * @return + */ + @OperLog(operModul = "现场大屏节目单管理", operType = "列表查询", operDesc = "列表查询现场大屏节目单信息") + @ApiOperation(value = "列表查询现场大屏节目单信息", notes = "列表查询现场大屏节目单信息", httpMethod="GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(xzLiveScreenProgramService.queryList(param)); + } + + /** + * 添加 + * @param xzLiveScreenProgram + * @return + */ + @OperLog(operModul = "现场大屏节目单管理", operType = "添加", operDesc = "添加现场大屏节目单信息") + @ApiOperation(value = "添加现场大屏节目单信息", notes = "添加现场大屏节目单信息" , httpMethod="POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate XzLiveScreenProgram xzLiveScreenProgram) { + xzLiveScreenProgramService.add(xzLiveScreenProgram); + return Result.ok(); + } + + /** + * 编辑 + * @param xzLiveScreenProgram + * @return + */ + @OperLog(operModul = "现场大屏节目单管理", operType = "编辑", operDesc = "编辑现场大屏节目单信息") + @ApiOperation(value = "编辑现场大屏节目单信息", notes = "编辑现场大屏节目单信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody XzLiveScreenProgram xzLiveScreenProgram) { + xzLiveScreenProgramService.edit(xzLiveScreenProgram); + return Result.ok(); + } + + /** + * 通过id删除 + * @return + */ + @OperLog(operModul = "现场大屏节目单管理", operType = "删除", operDesc = "删除现场大屏节目单信息") + @ApiOperation(value = "删除现场大屏节目单信息", notes = "删除现场大屏节目单信息" , httpMethod="POST") + @ApiImplicitParam(name = "id", value = "现场大屏节目单ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + xzLiveScreenProgramService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * @param id + * @return + */ + @OperLog(operModul = "现场大屏节目单管理", operType = "通过id查询", operDesc = "通过id查询现场大屏节目单信息") + @ApiOperation(value = "通过id查询现场大屏节目单信息", notes = "通过id查询现场大屏节目单信息" , httpMethod="GET") + @ApiImplicitParam(name = "id", value = "现场大屏节目单ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + return Result.success(xzLiveScreenProgramService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java index 1fd7bcf1d..888b29eb8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java @@ -137,7 +137,7 @@ public class XzTaskProgressTotalController { }) @PostMapping(value = "/countEnterprise") public Result> countEnterprise(@ApiIgnore @RequestBody Map param) { - return Result.success(xzTaskProgressTotalService.countEnterprise(param)); + return Result.success(xzTaskProgressTotalService.countEnterpriseCbs(param)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzLiveScreenDanmu.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzLiveScreenDanmu.java new file mode 100644 index 000000000..bd38a6c74 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzLiveScreenDanmu.java @@ -0,0 +1,50 @@ +package com.zhgd.xmgl.modules.xz.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 现场大屏弹幕 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@Data +@TableName("xz_live_screen_danmu") +@ApiModel(value="XzLiveScreenDanmu实体类",description="XzLiveScreenDanmu") +public class XzLiveScreenDanmu implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**用户id*/ + @Excel(name = "用户id", width = 15) + @ApiModelProperty(value="用户id") + private java.lang.Long userId ; + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value="内容") + private java.lang.String content ; + /**创建时间 yyyy-MM-dd HH:mm:ss*/ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime ; + /**更新时间 yyyy-MM-dd HH:mm:ss*/ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzLiveScreenProgram.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzLiveScreenProgram.java new file mode 100644 index 000000000..76042383f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzLiveScreenProgram.java @@ -0,0 +1,78 @@ +package com.zhgd.xmgl.modules.xz.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 现场大屏节目单 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@Data +@TableName("xz_live_screen_program") +@ApiModel(value="XzLiveScreenProgram实体类",description="XzLiveScreenProgram") +public class XzLiveScreenProgram implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**日期（周1到周7）*/ + @Excel(name = "日期（周1到周7）", width = 15) + @ApiModelProperty(value="日期（周1到周7）") + private java.lang.Integer dayOfWeek ; + /**节目名称*/ + @Excel(name = "节目名称", width = 15) + @ApiModelProperty(value="节目名称") + private java.lang.String programName ; + /**播放文件名称*/ + @Excel(name = "播放文件名称", width = 15) + @ApiModelProperty(value="播放文件名称") + private java.lang.String fileName ; + /**文件路径*/ + @Excel(name = "文件路径", width = 15) + @ApiModelProperty(value="文件路径") + private java.lang.String filePath ; + /**节目排序*/ + @Excel(name = "节目排序", width = 15) + @ApiModelProperty(value="节目排序") + private java.lang.Integer sort ; + /**文件类型,1:视频;2:图片;*/ + @Excel(name = "文件类型,1:视频;2:图片;", width = 15) + @ApiModelProperty(value="文件类型,1:视频;2:图片;") + private java.lang.Integer fileType ; + /**图片显示定时*/ + @Excel(name = "图片显示定时", width = 15) + @ApiModelProperty(value="图片显示定时") + private java.lang.Double showTime ; + /**图片显示定时单位,1:秒;2:分;3:小时*/ + @Excel(name = "图片显示定时单位,1:秒;2:分;3:小时", width = 15) + @ApiModelProperty(value="图片显示定时单位,1:秒;2:分;3:小时") + private java.lang.Integer showUnit ; + /**项目sn*/ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value="项目sn") + private java.lang.String projectSn ; + /**创建时间 yyyy-MM-dd HH:mm:ss*/ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime ; + /**更新时间 yyyy-MM-dd HH:mm:ss*/ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzLiveScreenDanmuMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzLiveScreenDanmuMapper.java new file mode 100644 index 000000000..73364ffcb --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzLiveScreenDanmuMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.xz.mapper; + +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenDanmu; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 现场大屏弹幕 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@Mapper +public interface XzLiveScreenDanmuMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzLiveScreenProgramMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzLiveScreenProgramMapper.java new file mode 100644 index 000000000..fb515459f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzLiveScreenProgramMapper.java @@ -0,0 +1,38 @@ +package com.zhgd.xmgl.modules.xz.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenProgram; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 现场大屏节目单 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@Mapper +public interface XzLiveScreenProgramMapper extends BaseMapper { + /** + * 分页列表查询现场大屏节目单信息 + * + * @param page + * @param queryWrapper + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 列表查询现场大屏节目单信息 + * + * @param queryWrapper + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java index e9e26afd4..c61fd666e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java @@ -25,11 +25,11 @@ public interface XzTaskProgressTotalMapper extends BaseMapper countEnterprise(@Param("param") Map param); + List countEnterpriseCbs(@Param("param") Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzLiveScreenDanmuMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzLiveScreenDanmuMapper.xml new file mode 100644 index 000000000..d5f688e7a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzLiveScreenDanmuMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzLiveScreenProgramMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzLiveScreenProgramMapper.xml new file mode 100644 index 000000000..c71ee8678 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzLiveScreenProgramMapper.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml index bb3b6c47a..e3532d21f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml @@ -10,14 +10,17 @@ and enterprise_id = #{enterpriseId} - select - ei.enterprise_name, + pe.cbs_name, x.change_after from enterprise_info ei join xz_task_progress_total x on x.enterprise_id = ei.id join project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn = x.project_sn - where x.project_sn = #{param.projectSn} and pe.parent_project_enterprise_id = 0 and x.is_current=1 and x.type=2 + where x.project_sn = #{param.projectSn} and x.is_current=1 and x.type=2 and x.change_after != 0 + + and pe.parent_project_enterprise_id = 0 + order by x.change_after desc diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzLiveScreenDanmuService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzLiveScreenDanmuService.java new file mode 100644 index 000000000..36afc0aee --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzLiveScreenDanmuService.java @@ -0,0 +1,73 @@ +package com.zhgd.xmgl.modules.xz.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.redis.lock.redisson.DistributedLock; +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenDanmu; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 现场大屏弹幕 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +public interface IXzLiveScreenDanmuService extends IService { + /** + * 分页列表查询现场大屏弹幕信息 + * + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + + /** + * 列表查询现场大屏弹幕信息 + * + * @param param 参数map + * @return + */ + List queryList(HashMap param); + + /** + * 添加现场大屏弹幕信息 + * + * @param xzLiveScreenDanmu 现场大屏弹幕 + * @return + */ + void add(XzLiveScreenDanmu xzLiveScreenDanmu); + + /** + * 编辑现场大屏弹幕信息 + * + * @param xzLiveScreenDanmu 现场大屏弹幕 + * @return + */ + void edit(XzLiveScreenDanmu xzLiveScreenDanmu); + + /** + * 根据id删除现场大屏弹幕信息 + * + * @param id 现场大屏弹幕的id + * @return + */ + void delete(String id); + + /** + * 根据id查询现场大屏弹幕信息 + * + * @param id 现场大屏弹幕的id + * @return + */ + XzLiveScreenDanmu queryById(String id); + + /** + * 保存现场大屏弹幕信息 + * + * @param xzLiveScreenDanmu + */ + @DistributedLock(keyPrefix = "xz_live_screen_danmu:", key = "#xzLiveScreenDanmu.id", tryLok = true, lockTime = 0) + void saveObj(XzLiveScreenDanmu xzLiveScreenDanmu); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzLiveScreenProgramService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzLiveScreenProgramService.java new file mode 100644 index 000000000..2e3f48e7f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzLiveScreenProgramService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.xz.service; + +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenProgram; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 现场大屏节目单 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +public interface IXzLiveScreenProgramService extends IService { + /** + * 分页列表查询现场大屏节目单信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询现场大屏节目单信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加现场大屏节目单信息 + * @param xzLiveScreenProgram 现场大屏节目单 + * @return + */ + void add(XzLiveScreenProgram xzLiveScreenProgram); + /** + * 编辑现场大屏节目单信息 + * @param xzLiveScreenProgram 现场大屏节目单 + * @return + */ + void edit(XzLiveScreenProgram xzLiveScreenProgram); + /** + * 根据id删除现场大屏节目单信息 + * @param id 现场大屏节目单的id + * @return + */ + void delete(String id); + /** + * 根据id查询现场大屏节目单信息 + * @param id 现场大屏节目单的id + * @return + */ + XzLiveScreenProgram queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java index 4665ad58f..39f1129a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java @@ -59,5 +59,5 @@ public interface IXzTaskProgressTotalService extends IService countEnterprise(Map param); + List countEnterpriseCbs(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzLiveScreenDanmuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzLiveScreenDanmuServiceImpl.java new file mode 100644 index 000000000..5be2b1234 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzLiveScreenDanmuServiceImpl.java @@ -0,0 +1,103 @@ +package com.zhgd.xmgl.modules.xz.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenDanmu; +import com.zhgd.xmgl.modules.xz.mapper.XzLiveScreenDanmuMapper; +import com.zhgd.xmgl.modules.xz.service.IXzLiveScreenDanmuService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 现场大屏弹幕 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@Service +public class XzLiveScreenDanmuServiceImpl extends ServiceImpl implements IXzLiveScreenDanmuService { + @Autowired + private XzLiveScreenDanmuMapper xzLiveScreenDanmuMapper; + + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzLiveScreenDanmu.class, param, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzLiveScreenDanmu::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzLiveScreenDanmu xzLiveScreenDanmu) { + xzLiveScreenDanmu.setId(null); + baseMapper.insert(xzLiveScreenDanmu); + } + + @Override + public void edit(XzLiveScreenDanmu xzLiveScreenDanmu) { + XzLiveScreenDanmu oldXzLiveScreenDanmu = baseMapper.selectById(xzLiveScreenDanmu.getId()); + if (oldXzLiveScreenDanmu == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzLiveScreenDanmu); + } + + @Override + public void delete(String id) { + XzLiveScreenDanmu xzLiveScreenDanmu = baseMapper.selectById(id); + if (xzLiveScreenDanmu == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public XzLiveScreenDanmu queryById(String id) { + XzLiveScreenDanmu entity = getById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + + @Override + public void saveObj(XzLiveScreenDanmu xzLiveScreenDanmu) { + XzLiveScreenDanmu danmu = xzLiveScreenDanmuMapper.selectOne(new LambdaQueryWrapper().eq(XzLiveScreenDanmu::getUserId, xzLiveScreenDanmu.getUserId())); + if (danmu != null) { + xzLiveScreenDanmu.setId(danmu.getId()); + this.edit(xzLiveScreenDanmu); + } else { + xzLiveScreenDanmu.setId(null); + this.add(xzLiveScreenDanmu); + } + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzLiveScreenProgramServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzLiveScreenProgramServiceImpl.java new file mode 100644 index 000000000..992288fe0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzLiveScreenProgramServiceImpl.java @@ -0,0 +1,88 @@ +package com.zhgd.xmgl.modules.xz.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.xz.entity.XzLiveScreenProgram; +import com.zhgd.xmgl.modules.xz.mapper.XzLiveScreenProgramMapper; +import com.zhgd.xmgl.modules.xz.service.IXzLiveScreenProgramService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.util.PageUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.HashMap; +import java.util.List; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 现场大屏节目单 + * @author： pds + * @date： 2024-07-11 + * @version： V1.0 + */ +@Service +public class XzLiveScreenProgramServiceImpl extends ServiceImpl implements IXzLiveScreenProgramService { + @Autowired + private XzLiveScreenProgramMapper xzLiveScreenProgramMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + String alias = "t."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzLiveScreenProgram.class, param, alias); + queryWrapper.orderByAsc(alias + RefUtil.fieldNameUlc(XzLiveScreenProgram::getSort)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzLiveScreenProgram xzLiveScreenProgram) { + xzLiveScreenProgram.setId(null); + baseMapper.insert(xzLiveScreenProgram); + } + + @Override + public void edit(XzLiveScreenProgram xzLiveScreenProgram) { + XzLiveScreenProgram oldXzLiveScreenProgram = baseMapper.selectById(xzLiveScreenProgram.getId()); + if(oldXzLiveScreenProgram==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzLiveScreenProgram); + } + + @Override + public void delete(String id) { + XzLiveScreenProgram xzLiveScreenProgram = baseMapper.selectById(id); + if(xzLiveScreenProgram==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public XzLiveScreenProgram queryById(String id) { + XzLiveScreenProgram entity = getById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java index 3597388c5..1df86e12a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java @@ -109,8 +109,8 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl countEnterprise(Map param) { - return baseMapper.countEnterprise(param); + public List countEnterpriseCbs(Map param) { + return baseMapper.countEnterpriseCbs(param); } diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 690dfb60b..a81f274bf 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -1,6 +1,7 @@ package ${bussiPackage}.${entityPackage}.controller; import com.alibaba.fastjson.JSONObject; +import com.zhgd.annotation.OperLog; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 5e7f7a462..a804ad7a9 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -29,10 +29,10 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ private ${entityName}Mapper ${entityName?uncap_first}Mapper; @Override public IPage<${entityName}> queryPageList(HashMap param) { - QueryWrapper<${entityName}> queryWrapper = getQueryWrapper(param); + QueryWrapper<${entityName}> queryWrapper = this.getQueryWrapper(param); Page<${entityName}> page = PageUtil.getPage(param); IPage<${entityName}> pageList = this.page(page, queryWrapper); - pageList.setRecords(dealList(pageList.getRecords())); + pageList.setRecords(this.dealList(pageList.getRecords())); return pageList; }