diff --git a/ruoyi-admin/src/main/resources/static/img/folder.png b/ruoyi-admin/src/main/resources/static/img/folder.png new file mode 100644 index 0000000..9746cf8 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/folder.png differ diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java index 47de512..56af839 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java @@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 巡检历史图片Controller * * @author wangh - * @date 2024-09-27 + * @date 2024-11-11 */ @Controller @RequestMapping("/manage/record_inspection_img") @@ -36,6 +36,11 @@ public class RecordInspectionImgController extends BaseController @RequiresPermissions("manage:record_inspection_img:view") @GetMapping() + public String record_inspection_lo() + { + return prefix + "/record_inspection_location"; + } + @GetMapping("/img") public String record_inspection_img() { return prefix + "/record_inspection_img"; @@ -44,7 +49,7 @@ public class RecordInspectionImgController extends BaseController /** * 查询巡检历史图片列表 */ - //@RequiresPermissions("manage:record_inspection_img:list") + @RequiresPermissions("manage:record_inspection_img:list") @PostMapping("/list") @ResponseBody public TableDataInfo list(RecordInspectionImg recordInspectionImg) @@ -53,6 +58,15 @@ public class RecordInspectionImgController extends BaseController List list = recordInspectionImgService.selectRecordInspectionImgList(recordInspectionImg); return getDataTable(list); } + @RequiresPermissions("manage:record_inspection_img:list") + @PostMapping("/locationList") + @ResponseBody + public TableDataInfo locationList(RecordInspectionImg recordInspectionImg) + { + startPage(); + List list = recordInspectionImgService.selectRecordInspectionlocationList(recordInspectionImg); + return getDataTable(list); + } /** * 导出巡检历史图片列表 diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java index 19a19a7..29aebfd 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java @@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * 巡检历史图片对象 record_inspection_img * * @author wangh - * @date 2024-09-27 + * @date 2024-11-11 */ public class RecordInspectionImg extends BaseEntity { @@ -23,6 +23,10 @@ public class RecordInspectionImg extends BaseEntity @Excel(name = "任务表id") private Long taskId; + /** 机位码 */ + @Excel(name = "机位码") + private String locationCode; + /** 路径 */ @Excel(name = "路径") private String imgPath; @@ -45,6 +49,15 @@ public class RecordInspectionImg extends BaseEntity { return taskId; } + public void setLocationCode(String locationCode) + { + this.locationCode = locationCode; + } + + public String getLocationCode() + { + return locationCode; + } public void setImgPath(String imgPath) { this.imgPath = imgPath; @@ -60,6 +73,7 @@ public class RecordInspectionImg extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("inspectionId", getInspectionId()) .append("taskId", getTaskId()) + .append("locationCode", getLocationCode()) .append("imgPath", getImgPath()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java index dc12c93..a9e6a75 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; * 巡检历史图片Mapper接口 * * @author wangh - * @date 2024-09-27 + * @date 2024-11-11 */ @Repository public interface RecordInspectionImgMapper @@ -59,4 +59,6 @@ public interface RecordInspectionImgMapper * @return 结果 */ public int deleteRecordInspectionImgByInspectionIds(String[] inspectionIds); + + List selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java index 425b8ee..ed8721f 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java @@ -7,7 +7,7 @@ import com.ruoyi.manage.domain.RecordInspectionImg; * 巡检历史图片Service接口 * * @author wangh - * @date 2024-09-27 + * @date 2024-11-11 */ public interface IRecordInspectionImgService { @@ -58,4 +58,6 @@ public interface IRecordInspectionImgService * @return 结果 */ public int deleteRecordInspectionImgByInspectionId(Long inspectionId); + + List selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java index ae3f4dc..638eca0 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java @@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert; * 巡检历史图片Service业务层处理 * * @author wangh - * @date 2024-09-27 + * @date 2024-11-11 */ @Service public class RecordInspectionImgServiceImpl implements IRecordInspectionImgService { @@ -57,6 +57,7 @@ public class RecordInspectionImgServiceImpl implements IRecordInspectionImgServi + recordInspectionImg.setCreateBy(ShiroUtils.getLoginName()); recordInspectionImg.setCreateTime(DateUtils.getNowDate()); return recordInspectionImgMapper.insertRecordInspectionImg(recordInspectionImg); @@ -94,4 +95,9 @@ public class RecordInspectionImgServiceImpl implements IRecordInspectionImgServi public int deleteRecordInspectionImgByInspectionId(Long inspectionId) { return recordInspectionImgMapper.deleteRecordInspectionImgByInspectionId(inspectionId); } + + @Override + public List selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg) { + return recordInspectionImgMapper.selectRecordInspectionlocationList( recordInspectionImg); + } } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml index ad53f55..532e836 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml @@ -7,13 +7,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select inspection_id, task_id, img_path, create_by, create_time from record_inspection_img + select inspection_id, task_id, location_code, img_path, create_by, create_time from record_inspection_img @@ -35,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inspection_id, task_id, + location_code, img_path, create_by, create_time, @@ -42,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{inspectionId}, #{taskId}, + #{locationCode}, #{imgPath}, #{createBy}, #{createTime}, @@ -52,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update record_inspection_img task_id = #{taskId}, + location_code = #{locationCode}, img_path = #{imgPath}, create_by = #{createBy}, create_time = #{createTime}, @@ -70,4 +77,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html index 52ff8fa..857d689 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html @@ -2,6 +2,7 @@ +
@@ -18,15 +19,25 @@
+
+ +
+ +
+
- + +
+ +
+ \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/edit.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/edit.html index ce93fe2..331e82e 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/edit.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/edit.html @@ -2,6 +2,7 @@ +
@@ -19,15 +20,25 @@
+
+ +
+ +
+
- + +
+ +
+ \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html index f1cdf9e..a7a6a81 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html @@ -19,8 +19,18 @@
  • - - + + +
  • +
  • + + +
  • +
  • + + + - +
  •  搜索 @@ -75,6 +85,10 @@ field: 'taskId', title: '任务表id' }, + { + field: 'locationCode', + title: '机位码' + }, { field: 'imgPath', title: '路径' diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html new file mode 100644 index 0000000..c9a9618 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html @@ -0,0 +1,143 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + +
    + + + + + + + + + + + + +
    +
    + +
    +
    +
    +
    + + + + + + \ No newline at end of file