From 995b7e88d6adbb4eb16b3f61af9da51e9febf377 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 15 Oct 2023 20:35:48 +0800 Subject: [PATCH] update code --- ruoyi-ui/src/api/video/prjphotography.js | 44 +++ ruoyi-ui/src/components/FileUpload/index.vue | 2 +- .../src/views/project/surProject/index.vue | 16 +- .../src/views/video/prjphotography/index.vue | 341 ++++++++++++++++++ .../prjphotography/phontographyUpload.vue | 269 ++++++++++++++ .../prjphotography/prjPhotographyDrawer.vue | 58 +++ ruoyi-ui/vue.config.js | 4 +- .../SurProjectPhotographyController.java | 104 ++++++ .../video/domain/SurProjectPhotography.java | 157 ++++++++ .../mapper/SurProjectPhotographyMapper.java | 61 ++++ .../ISurProjectPhotographyService.java | 61 ++++ .../SurProjectPhotographyServiceImpl.java | 95 +++++ .../video/SurProjectPhotographyMapper.xml | 103 ++++++ 13 files changed, 1310 insertions(+), 5 deletions(-) create mode 100644 ruoyi-ui/src/api/video/prjphotography.js create mode 100644 ruoyi-ui/src/views/video/prjphotography/index.vue create mode 100644 ruoyi-ui/src/views/video/prjphotography/phontographyUpload.vue create mode 100644 ruoyi-ui/src/views/video/prjphotography/prjPhotographyDrawer.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectPhotographyController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/SurProjectPhotography.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java create mode 100644 yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml diff --git a/ruoyi-ui/src/api/video/prjphotography.js b/ruoyi-ui/src/api/video/prjphotography.js new file mode 100644 index 00000000..b010b72c --- /dev/null +++ b/ruoyi-ui/src/api/video/prjphotography.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询项目延时摄影列表 +export function listPrjphotography(query) { + return request({ + url: '/video/prjphotography/list', + method: 'get', + params: query + }) +} + +// 查询项目延时摄影详细 +export function getPrjphotography(id) { + return request({ + url: '/video/prjphotography/' + id, + method: 'get' + }) +} + +// 新增项目延时摄影 +export function addPrjphotography(data) { + return request({ + url: '/video/prjphotography', + method: 'post', + data: data + }) +} + +// 修改项目延时摄影 +export function updatePrjphotography(data) { + return request({ + url: '/video/prjphotography', + method: 'put', + data: data + }) +} + +// 删除项目延时摄影 +export function delPrjphotography(id) { + return request({ + url: '/video/prjphotography/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue index 4d260647..5aa6e978 100644 --- a/ruoyi-ui/src/components/FileUpload/index.vue +++ b/ruoyi-ui/src/components/FileUpload/index.vue @@ -1,5 +1,5 @@ @@ -805,6 +812,7 @@ import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue"; import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue'; import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vue'; import aiBoxVideoConfigDrawer from '@/views/video/aiBoxProjectConfig/aiBoxVideoConfigDrawer'; +import prjPhotographyDrawer from '@/views/video/prjphotography/prjPhotographyDrawer.vue' import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数 export default { @@ -829,7 +837,8 @@ export default { checkDetectionDrawer, standardDrawer, attendanceDataDrawer, - aiBoxVideoConfigDrawer, + aiBoxVideoConfigDrawer, + prjPhotographyDrawer }, dicts: [ "sur_project_xmjd", @@ -1091,6 +1100,9 @@ export default { case "handleAiBoxVideoConfig": this.$refs.aiBoxVideoConfigDrawer.show(row); break; + case "handlePrjPhotography": + this.$refs.prjPhotographyDrawer.show(row); + break; default: break; } diff --git a/ruoyi-ui/src/views/video/prjphotography/index.vue b/ruoyi-ui/src/views/video/prjphotography/index.vue new file mode 100644 index 00000000..125bfd8d --- /dev/null +++ b/ruoyi-ui/src/views/video/prjphotography/index.vue @@ -0,0 +1,341 @@ + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/video/prjphotography/phontographyUpload.vue b/ruoyi-ui/src/views/video/prjphotography/phontographyUpload.vue new file mode 100644 index 00000000..a44be4f6 --- /dev/null +++ b/ruoyi-ui/src/views/video/prjphotography/phontographyUpload.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/ruoyi-ui/src/views/video/prjphotography/prjPhotographyDrawer.vue b/ruoyi-ui/src/views/video/prjphotography/prjPhotographyDrawer.vue new file mode 100644 index 00000000..41b70b4b --- /dev/null +++ b/ruoyi-ui/src/views/video/prjphotography/prjPhotographyDrawer.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f0a5359d..55103481 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -41,8 +41,8 @@ module.exports = { // } // }, '/jhapi':{ - //target: `http://62.234.3.186/jhapi/`, - target: `http://127.0.0.1:8090/jhapi/`, + target: `http://62.234.3.186/jhapi/`, + //target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/' diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectPhotographyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectPhotographyController.java new file mode 100644 index 00000000..10b3c143 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectPhotographyController.java @@ -0,0 +1,104 @@ +package com.yanzhu.jh.video.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.video.domain.SurProjectPhotography; +import com.yanzhu.jh.video.service.ISurProjectPhotographyService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 项目延时摄影Controller + * + * @author ruoyi + * @date 2023-10-15 + */ +@RestController +@RequestMapping("/video/prjphotography") +public class SurProjectPhotographyController extends BaseController +{ + @Autowired + private ISurProjectPhotographyService surProjectPhotographyService; + + /** + * 查询项目延时摄影列表 + */ + @PreAuthorize("@ss.hasPermi('video:prjphotography:list')") + @GetMapping("/list") + public TableDataInfo list(SurProjectPhotography surProjectPhotography) + { + startPage(); + List list = surProjectPhotographyService.selectSurProjectPhotographyList(surProjectPhotography); + return getDataTable(list); + } + + /** + * 导出项目延时摄影列表 + */ + @PreAuthorize("@ss.hasPermi('video:prjphotography:export')") + @Log(title = "项目延时摄影", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SurProjectPhotography surProjectPhotography) + { + List list = surProjectPhotographyService.selectSurProjectPhotographyList(surProjectPhotography); + ExcelUtil util = new ExcelUtil(SurProjectPhotography.class); + util.exportExcel(response, list, "项目延时摄影数据"); + } + + /** + * 获取项目延时摄影详细信息 + */ + @PreAuthorize("@ss.hasPermi('video:prjphotography:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(surProjectPhotographyService.selectSurProjectPhotographyById(id)); + } + + /** + * 新增项目延时摄影 + */ + @PreAuthorize("@ss.hasPermi('video:prjphotography:add')") + @Log(title = "项目延时摄影", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SurProjectPhotography surProjectPhotography) + { + return toAjax(surProjectPhotographyService.insertSurProjectPhotography(surProjectPhotography)); + } + + /** + * 修改项目延时摄影 + */ + @PreAuthorize("@ss.hasPermi('video:prjphotography:edit')") + @Log(title = "项目延时摄影", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SurProjectPhotography surProjectPhotography) + { + return toAjax(surProjectPhotographyService.updateSurProjectPhotography(surProjectPhotography)); + } + + /** + * 删除项目延时摄影 + */ + @PreAuthorize("@ss.hasPermi('video:prjphotography:remove')") + @Log(title = "项目延时摄影", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(surProjectPhotographyService.deleteSurProjectPhotographyByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/SurProjectPhotography.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/SurProjectPhotography.java new file mode 100644 index 00000000..1e6acf18 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/domain/SurProjectPhotography.java @@ -0,0 +1,157 @@ +package com.yanzhu.jh.video.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 项目延时摄影对象 sur_project_photography + * + * @author ruoyi + * @date 2023-10-15 + */ +public class SurProjectPhotography extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 项目ID */ + @Excel(name = "项目ID") + private Long projectId; + + /** 图片路径 */ + @Excel(name = "图片路径") + private String imageUrl; + + /** 视频路径 */ + @Excel(name = "视频路径") + private String videoUrl; + + /** 视频日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "视频日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date videoDate; + + /** 状态 */ + @Excel(name = "状态") + private Long state; + + /** */ + @Excel(name = "") + private Long isDel; + + /** */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setImageUrl(String imageUrl) + { + this.imageUrl = imageUrl; + } + + public String getImageUrl() + { + return imageUrl; + } + public void setVideoUrl(String videoUrl) + { + this.videoUrl = videoUrl; + } + + public String getVideoUrl() + { + return videoUrl; + } + public void setVideoDate(Date videoDate) + { + this.videoDate = videoDate; + } + + public Date getVideoDate() + { + return videoDate; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("projectId", getProjectId()) + .append("imageUrl", getImageUrl()) + .append("videoUrl", getVideoUrl()) + .append("videoDate", getVideoDate()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java new file mode 100644 index 00000000..971ab7aa --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.video.mapper; + +import java.util.List; +import com.yanzhu.jh.video.domain.SurProjectPhotography; + +/** + * 项目延时摄影Mapper接口 + * + * @author ruoyi + * @date 2023-10-15 + */ +public interface SurProjectPhotographyMapper +{ + /** + * 查询项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 项目延时摄影 + */ + public SurProjectPhotography selectSurProjectPhotographyById(Long id); + + /** + * 查询项目延时摄影列表 + * + * @param surProjectPhotography 项目延时摄影 + * @return 项目延时摄影集合 + */ + public List selectSurProjectPhotographyList(SurProjectPhotography surProjectPhotography); + + /** + * 新增项目延时摄影 + * + * @param surProjectPhotography 项目延时摄影 + * @return 结果 + */ + public int insertSurProjectPhotography(SurProjectPhotography surProjectPhotography); + + /** + * 修改项目延时摄影 + * + * @param surProjectPhotography 项目延时摄影 + * @return 结果 + */ + public int updateSurProjectPhotography(SurProjectPhotography surProjectPhotography); + + /** + * 删除项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 结果 + */ + public int deleteSurProjectPhotographyById(Long id); + + /** + * 批量删除项目延时摄影 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurProjectPhotographyByIds(Long[] ids); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java new file mode 100644 index 00000000..d1b7728d --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.video.service; + +import java.util.List; +import com.yanzhu.jh.video.domain.SurProjectPhotography; + +/** + * 项目延时摄影Service接口 + * + * @author ruoyi + * @date 2023-10-15 + */ +public interface ISurProjectPhotographyService +{ + /** + * 查询项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 项目延时摄影 + */ + public SurProjectPhotography selectSurProjectPhotographyById(Long id); + + /** + * 查询项目延时摄影列表 + * + * @param surProjectPhotography 项目延时摄影 + * @return 项目延时摄影集合 + */ + public List selectSurProjectPhotographyList(SurProjectPhotography surProjectPhotography); + + /** + * 新增项目延时摄影 + * + * @param surProjectPhotography 项目延时摄影 + * @return 结果 + */ + public int insertSurProjectPhotography(SurProjectPhotography surProjectPhotography); + + /** + * 修改项目延时摄影 + * + * @param surProjectPhotography 项目延时摄影 + * @return 结果 + */ + public int updateSurProjectPhotography(SurProjectPhotography surProjectPhotography); + + /** + * 批量删除项目延时摄影 + * + * @param ids 需要删除的项目延时摄影主键集合 + * @return 结果 + */ + public int deleteSurProjectPhotographyByIds(Long[] ids); + + /** + * 删除项目延时摄影信息 + * + * @param id 项目延时摄影主键 + * @return 结果 + */ + public int deleteSurProjectPhotographyById(Long id); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java new file mode 100644 index 00000000..d37b1bc9 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java @@ -0,0 +1,95 @@ +package com.yanzhu.jh.video.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.jh.video.mapper.SurProjectPhotographyMapper; +import com.yanzhu.jh.video.domain.SurProjectPhotography; +import com.yanzhu.jh.video.service.ISurProjectPhotographyService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 项目延时摄影Service业务层处理 + * + * @author ruoyi + * @date 2023-10-15 + */ +@Service +public class SurProjectPhotographyServiceImpl implements ISurProjectPhotographyService +{ + @Autowired + private SurProjectPhotographyMapper surProjectPhotographyMapper; + + /** + * 查询项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 项目延时摄影 + */ + @Override + public SurProjectPhotography selectSurProjectPhotographyById(Long id) + { + return surProjectPhotographyMapper.selectSurProjectPhotographyById(id); + } + + /** + * 查询项目延时摄影列表 + * + * @param surProjectPhotography 项目延时摄影 + * @return 项目延时摄影 + */ + @Override + public List selectSurProjectPhotographyList(SurProjectPhotography surProjectPhotography) + { + return surProjectPhotographyMapper.selectSurProjectPhotographyList(surProjectPhotography); + } + + /** + * 新增项目延时摄影 + * + * @param surProjectPhotography 项目延时摄影 + * @return 结果 + */ + @Override + public int insertSurProjectPhotography(SurProjectPhotography surProjectPhotography) + { + surProjectPhotography.setCreateBy(SecurityUtils.getUsername()); + return surProjectPhotographyMapper.insertSurProjectPhotography(surProjectPhotography); + } + + /** + * 修改项目延时摄影 + * + * @param surProjectPhotography 项目延时摄影 + * @return 结果 + */ + @Override + public int updateSurProjectPhotography(SurProjectPhotography surProjectPhotography) + { + surProjectPhotography.setUpdateBy(SecurityUtils.getUsername()); + return surProjectPhotographyMapper.updateSurProjectPhotography(surProjectPhotography); + } + + /** + * 批量删除项目延时摄影 + * + * @param ids 需要删除的项目延时摄影主键 + * @return 结果 + */ + @Override + public int deleteSurProjectPhotographyByIds(Long[] ids) + { + return surProjectPhotographyMapper.deleteSurProjectPhotographyByIds(ids); + } + + /** + * 删除项目延时摄影信息 + * + * @param id 项目延时摄影主键 + * @return 结果 + */ + @Override + public int deleteSurProjectPhotographyById(Long id) + { + return surProjectPhotographyMapper.deleteSurProjectPhotographyById(id); + } +} diff --git a/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml new file mode 100644 index 00000000..f804f57f --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + select id, project_id, image_url, video_url, video_date, state, remark, is_del, create_by, create_date, update_by, update_date from sur_project_photography + + + + + + + + insert into sur_project_photography + + project_id, + image_url, + video_url, + video_date, + state, + remark, + is_del, + create_by, + create_date, + update_by, + update_date, + + + #{projectId}, + #{imageUrl}, + #{videoUrl}, + #{videoDate}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + + + + + update sur_project_photography + + project_id = #{projectId}, + image_url = #{imageUrl}, + video_url = #{videoUrl}, + video_date = #{videoDate}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + + where id = #{id} + + + + delete from sur_project_photography where id = #{id} + + + + delete from sur_project_photography where id in + + #{id} + + + \ No newline at end of file