From 28da293f80c17b99fa0a6290d2d0821f1296f5c1 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 11 Nov 2024 17:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/img/folder.png | Bin 0 -> 3198 bytes .../RecordInspectionImgController.java | 18 ++- .../manage/domain/RecordInspectionImg.java | 16 +- .../mapper/RecordInspectionImgMapper.java | 4 +- .../service/IRecordInspectionImgService.java | 4 +- .../impl/RecordInspectionImgServiceImpl.java | 8 +- .../manage/RecordInspectionImgMapper.xml | 18 ++- .../manage/record_inspection_img/add.html | 23 ++- .../manage/record_inspection_img/edit.html | 29 +++- .../record_inspection_img.html | 18 ++- .../record_inspection_location.html | 143 ++++++++++++++++++ 11 files changed, 270 insertions(+), 11 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/static/img/folder.png create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_location.html 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 0000000000000000000000000000000000000000..9746cf8d2a122ceff275fc043f61f23e27c0fc56 GIT binary patch literal 3198 zcmeHK`%}`17XN}^hM6z&v8kx!)h$%)_VR^a(|l|SYPD)9GFU!#EiyGU(WHm@#BI~G z)s)Q2ZYff_X`o_>-dkQ})3j97#Yc(>u9OIpEIV`mhkIvkKb`ZL`OKL!pL5P<=H!Rq z{q+#vAOHZ+3k>iL0|1C7g#bF*nh0GtE=aXsD3s)LhDuA9##6F8WilGkl-8WmFQ*ZuB^0Sd za{JJlHE7)cUO#{Cvaz)Rf@fq9fMEhg*C?q_1aIsABgpzTXQhXI%H?j<6;3U$%2VG2 zHMucRKy9nyW$S*b174w6IBZ;}>TRB=)#3FqLpG^%@}E~JNQdbd7o>jA%*-)<&!$Gc z4>OS7qstuMv(F@yXl(eXk`_8Jy6fx--;9i8@vk+1SPQOzci|xu9_R7M*|K16MLhQ& zuhDELVdpS~bJ>vo99p~$%#f`R{0&FmX4%N4<-EzeRZ%fXG?FYkddU__u@MA7O1+{x zY+tpOoI}A2R!sT1rx%s!wRhbd1VNCb`h^nw|TS+OnHs-i+xz0hgc- z7oU(bwgjIspRwVrpW&kljy$Up2o*uYKhl-(rbLCgVX_Y^W=J-9kZE!JL=snh9tXRR z4(SBWSaC1~E42$2l4@<(tF<_G@?!b+^q>8AAnRj*Z1v>I=-O%UHH6zx5)M!n*N7Pk zVRBNka(JDCEihN^VgkxVVdY@%E8T+6V;v)v*D`-7ha*ALH;$qY{M?4=XfytnFWW+Z zFP|lE6WwD6s?mjmsu>b1hog*w3(8Jr9SI5l`QxGmg2@{9^!)gXXs97x{t2cpt;&JU z#S8rB1=87iBsoV!%Cm#S8 zZpP^96IH+G-Lr2w+l0<^SWYjU4G!&o+wPzR7rdNNZp>#Kw(aQ<$YU+v?Wg}38?Go5 zHT}_B=@tsvW9RBHVD9cko)CFwY?uDl3M!5U-F$$&)~Jp(F8Lk^cG&vn?>8F@BUE?1 zFQBDwxI7;hkLG_INDw|vLp1k-^rhBHF^Dd4%8Tp} zjFf!5?M-6w==OenUWou=im`Wq&$XY+zY5TCh%NsvjySgfAbAwRJM*VC<_pvF3|o-& z9jPnP3&Yq@-b%xY)fk@e(Ru!IVYavqkC515E$JE3&X)9ny)7M+oNS2d%&c!;`oC(F z1ba|!P>;q^XIX`_`)PIkXt60zxXYd#0U6rd)egIFhmGe`3fL&tt>JdocpV^~Zz~5Y zp$KMhR=jaSBnWA?$eG^UtdVwfh`Nt{Q!|OzkOS5K4GPH`L6VJHvKQHK$0M2+a1i)U z&MC&m>A@f*LK~W|X-%|Tj0Yj_AYZ{(4gQz+K(oqI9WCyn*9 zZ*z7z-pPs4I`brPTrujXF=N(b8@Bqnc3 z?=Nzt;0*IRcJu#Bxkd`NQ%-8S)6;TVN# z+urIo<0Al3Z8TfcnR?74bL72?f^00EGl%JLiKLn3a`MJ#N+Fe)nsx+RoTa@i)-4+w zuqYG~qD|dV#P>soFKnd`L497{a9OWEQOFLS4tC!|1X$a;+IumKTmCTyvy#1`cnhmj zeLpB?Jxjp-@B-Uf8jienJ@3v5viwH5sg(1;zUF)RW8k@Y(L 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