增加 报废图片

ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java

@@ -172,18 +172,6 @@ public class ApiController {
     @Autowired
     private IRecordInvalidatedService recordInvalidatedService;
 
-    @PostMapping("/bf/submit")
-    public AjaxResult bfSubmit(String epc, String user, String remark) {
-        //插入记录
-        RecordInvalidated recordInvalidated = new RecordInvalidated();
-        recordInvalidated.setEpc(epc);
-        recordInvalidated.setCreateBy(user);
-        recordInvalidated.setRemark(remark);
-        recordInvalidatedService.insertRecordInvalidated(recordInvalidated);
-        //修改台账
-        apiService.updataLedgerForBf(epc, "2");
-        return success();
-    }
 
 
     @PostMapping("/xj/selectLite")
@@ -208,8 +196,6 @@ public class ApiController {
 
         //存储图片，插库
         String filePath = RuoYiConfig.getUploadPath() + "/inspection";
-        Date date = new Date();
-
         if (files != null && files.size() > 0) {
             for (MultipartFile multipartFile : files) {
                 String pathName = null;
@@ -276,6 +262,43 @@ public class ApiController {
         return success("创建成功", insertNumber);
 
     }
+    /**
+     * 轮挡报废
+     * @param epc
+     * @param user
+     * @param remark
+     * @return
+     */
+    @PostMapping("/bf/submit")
+    public AjaxResult bfSubmit(String epc, String reason,String user, String remark,List<MultipartFile> files) {
+        //插入记录
+        RecordInvalidated recordInvalidated = new RecordInvalidated();
+        recordInvalidated.setEpc(epc);
+        recordInvalidated.setCreateBy(user);
+        recordInvalidated.setRemark(remark);
+        recordInvalidatedService.insertRecordInvalidated(recordInvalidated);
+        //
+
+        //修改台账
+        apiService.updataLedgerForBf(epc, "2");
+
+        //存储图片，插库
+        String filePath = RuoYiConfig.getUploadPath() + "/inspection";
+        if (files != null && files.size() > 0) {
+            for (MultipartFile multipartFile : files) {
+                String pathName = null;
+                try {
+                    pathName = FileUploadUtils.upload(filePath, multipartFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                System.out.println("上传图片路径：" + pathName);
+                apiService.insertBfImg(recordInvalidated.getObjid(),epc,user, pathName);
+            }
+        }
+
+        return success();
+    }
 
     @PostMapping("/fpin/select")
     public AjaxResult fpInSelect(String epc) {

ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java

@@ -69,4 +69,9 @@ public interface ApiMapper {
                                 @Param("tableId") long tableId,
                                 @Param("user") String user,
                                 @Param("pathName") String pathName);
+
+    void insertBfImg(@Param("objid") Long objid,
+                    @Param("epc") String epc,
+                     @Param("user") String user,
+                     @Param("pathName") String pathName);
 }

ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java

@@ -124,4 +124,8 @@ public class ApiService {
     public void insertInspetionPictrue(long inspectionId, long tableId, String user, String pathName) {
         mapper.insertInspetionPictrue(inspectionId, tableId,user, pathName);
     }
+
+    public void insertBfImg(Long objid, String epc, String user, String pathName) {
+        mapper.insertBfImg(objid,epc,user, pathName);
+    }
 }

ruoyi-api/src/main/resources/mapper/ApiMapper.xml

@@ -236,13 +236,18 @@
         where is_scrap = 1
           and location_code = #{code}
     </select>
-<!--完成任务-->
-    <update id="updataInspectionTaskByObjid" >
+    <!--完成任务-->
+    <update id="updataInspectionTaskByObjid">
         UPDATE record_inspection_task SET task_state = '完成' WHERE objid = #{tableId};
     </update>
 
-    <insert id="insertInspetionPictrue" >
+    <insert id="insertInspetionPictrue">
         INSERT INTO record_inspection_img (inspection_id, task_id, img_path, create_by)
          VALUES (#{inspetionId},#{tableId}, #{pathName}, #{user});
     </insert>
+
+    <insert id="insertBfImg">
+        INSERT INTO bg_wheel_chocks.record_invalidated_img (invalidated_id, epc, img_path, create_by)
+        VALUES (#{objid}, #{epc},#{pathName},#{user});
+    </insert>
 </mapper>

ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java

@@ -0,0 +1,127 @@
+package com.ruoyi.manage.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.manage.domain.RecordInspectionImg;
+import com.ruoyi.manage.service.IRecordInspectionImgService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 巡检历史图片Controller
+ * 
+ * @author wangh
+ * @date 2024-09-27
+ */
+@Controller
+@RequestMapping("/manage/record_inspection_img")
+public class RecordInspectionImgController extends BaseController
+{
+    private String prefix = "manage/record_inspection_img";
+
+    @Autowired
+    private IRecordInspectionImgService recordInspectionImgService;
+
+    @RequiresPermissions("manage:record_inspection_img:view")
+    @GetMapping()
+    public String record_inspection_img()
+    {
+        return prefix + "/record_inspection_img";
+    }
+
+    /**
+     * 查询巡检历史图片列表
+     */
+    //@RequiresPermissions("manage:record_inspection_img:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(RecordInspectionImg recordInspectionImg)
+    {
+        startPage();
+        List<RecordInspectionImg> list = recordInspectionImgService.selectRecordInspectionImgList(recordInspectionImg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检历史图片列表
+     */
+    @RequiresPermissions("manage:record_inspection_img:export")
+    @Log(title = "巡检历史图片", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(RecordInspectionImg recordInspectionImg)
+    {
+        List<RecordInspectionImg> list = recordInspectionImgService.selectRecordInspectionImgList(recordInspectionImg);
+        ExcelUtil<RecordInspectionImg> util = new ExcelUtil<RecordInspectionImg>(RecordInspectionImg.class);
+        return util.exportExcel(list, "巡检历史图片数据");
+    }
+
+    /**
+     * 新增巡检历史图片
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存巡检历史图片
+     */
+    @RequiresPermissions("manage:record_inspection_img:add")
+    @Log(title = "巡检历史图片", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(RecordInspectionImg recordInspectionImg)
+    {
+        return toAjax(recordInspectionImgService.insertRecordInspectionImg(recordInspectionImg));
+    }
+
+    /**
+     * 修改巡检历史图片
+     */
+    @RequiresPermissions("manage:record_inspection_img:edit")
+    @GetMapping("/edit/{inspectionId}")
+    public String edit(@PathVariable("inspectionId") Long inspectionId, ModelMap mmap)
+    {
+        RecordInspectionImg recordInspectionImg = recordInspectionImgService.selectRecordInspectionImgByInspectionId(inspectionId);
+        mmap.put("recordInspectionImg", recordInspectionImg);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存巡检历史图片
+     */
+    @RequiresPermissions("manage:record_inspection_img:edit")
+    @Log(title = "巡检历史图片", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(RecordInspectionImg recordInspectionImg)
+    {
+        return toAjax(recordInspectionImgService.updateRecordInspectionImg(recordInspectionImg));
+    }
+
+    /**
+     * 删除巡检历史图片
+     */
+    @RequiresPermissions("manage:record_inspection_img:remove")
+    @Log(title = "巡检历史图片", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(recordInspectionImgService.deleteRecordInspectionImgByInspectionIds(ids));
+    }
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedImgController.java

@@ -0,0 +1,127 @@
+package com.ruoyi.manage.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.manage.domain.RecordInvalidatedImg;
+import com.ruoyi.manage.service.IRecordInvalidatedImgService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 轮挡报废图片记录Controller
+ * 
+ * @author wangh
+ * @date 2024-09-27
+ */
+@Controller
+@RequestMapping("/manage/record_invalidated_img")
+public class RecordInvalidatedImgController extends BaseController
+{
+    private String prefix = "manage/record_invalidated_img";
+
+    @Autowired
+    private IRecordInvalidatedImgService recordInvalidatedImgService;
+
+    @RequiresPermissions("manage:record_invalidated_img:view")
+    @GetMapping()
+    public String record_invalidated_img()
+    {
+        return prefix + "/record_invalidated_img";
+    }
+
+    /**
+     * 查询轮挡报废图片记录列表
+     */
+    //@RequiresPermissions("manage:record_invalidated_img:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(RecordInvalidatedImg recordInvalidatedImg)
+    {
+        startPage();
+        List<RecordInvalidatedImg> list = recordInvalidatedImgService.selectRecordInvalidatedImgList(recordInvalidatedImg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出轮挡报废图片记录列表
+     */
+    @RequiresPermissions("manage:record_invalidated_img:export")
+    @Log(title = "轮挡报废图片记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(RecordInvalidatedImg recordInvalidatedImg)
+    {
+        List<RecordInvalidatedImg> list = recordInvalidatedImgService.selectRecordInvalidatedImgList(recordInvalidatedImg);
+        ExcelUtil<RecordInvalidatedImg> util = new ExcelUtil<RecordInvalidatedImg>(RecordInvalidatedImg.class);
+        return util.exportExcel(list, "轮挡报废图片记录数据");
+    }
+
+    /**
+     * 新增轮挡报废图片记录
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存轮挡报废图片记录
+     */
+    @RequiresPermissions("manage:record_invalidated_img:add")
+    @Log(title = "轮挡报废图片记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(RecordInvalidatedImg recordInvalidatedImg)
+    {
+        return toAjax(recordInvalidatedImgService.insertRecordInvalidatedImg(recordInvalidatedImg));
+    }
+
+    /**
+     * 修改轮挡报废图片记录
+     */
+    @RequiresPermissions("manage:record_invalidated_img:edit")
+    @GetMapping("/edit/{objid}")
+    public String edit(@PathVariable("objid") Long objid, ModelMap mmap)
+    {
+        RecordInvalidatedImg recordInvalidatedImg = recordInvalidatedImgService.selectRecordInvalidatedImgByObjid(objid);
+        mmap.put("recordInvalidatedImg", recordInvalidatedImg);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存轮挡报废图片记录
+     */
+    @RequiresPermissions("manage:record_invalidated_img:edit")
+    @Log(title = "轮挡报废图片记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(RecordInvalidatedImg recordInvalidatedImg)
+    {
+        return toAjax(recordInvalidatedImgService.updateRecordInvalidatedImg(recordInvalidatedImg));
+    }
+
+    /**
+     * 删除轮挡报废图片记录
+     */
+    @RequiresPermissions("manage:record_invalidated_img:remove")
+    @Log(title = "轮挡报废图片记录", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(recordInvalidatedImgService.deleteRecordInvalidatedImgByObjids(ids));
+    }
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java

@@ -0,0 +1,68 @@
+package com.ruoyi.manage.domain;
+
+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;
+
+/**
+ * 巡检历史图片对象 record_inspection_img
+ * 
+ * @author wangh
+ * @date 2024-09-27
+ */
+public class RecordInspectionImg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 巡检id */
+    @Excel(name = "巡检id")
+    private Long inspectionId;
+
+    /** 任务表id */
+    @Excel(name = "任务表id")
+    private Long taskId;
+
+    /** 路径 */
+    @Excel(name = "路径")
+    private String imgPath;
+
+    public void setInspectionId(Long inspectionId) 
+    {
+        this.inspectionId = inspectionId;
+    }
+
+    public Long getInspectionId() 
+    {
+        return inspectionId;
+    }
+    public void setTaskId(Long taskId) 
+    {
+        this.taskId = taskId;
+    }
+
+    public Long getTaskId() 
+    {
+        return taskId;
+    }
+    public void setImgPath(String imgPath) 
+    {
+        this.imgPath = imgPath;
+    }
+
+    public String getImgPath() 
+    {
+        return imgPath;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inspectionId", getInspectionId())
+            .append("taskId", getTaskId())
+            .append("imgPath", getImgPath())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java

@@ -22,7 +22,18 @@ public class RecordInvalidated extends BaseEntity
     @Excel(name = "RFID")
     private String epc;
 
-    public void setObjid(Long objid) 
+    private String reason;
+
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public void setObjid(Long objid)
     {
         this.objid = objid;
     }

ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidatedImg.java

@@ -0,0 +1,81 @@
+package com.ruoyi.manage.domain;
+
+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;
+
+/**
+ * 轮挡报废图片记录对象 record_invalidated_img
+ * 
+ * @author wangh
+ * @date 2024-09-27
+ */
+public class RecordInvalidatedImg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long objid;
+
+    /** 报废记录ID */
+    @Excel(name = "报废记录ID")
+    private Long invalidatedId;
+
+    /** RFID */
+    @Excel(name = "RFID")
+    private String epc;
+
+    /** RFID */
+    @Excel(name = "RFID")
+    private String imgPath;
+
+    public void setObjid(Long objid) 
+    {
+        this.objid = objid;
+    }
+
+    public Long getObjid() 
+    {
+        return objid;
+    }
+    public void setInvalidatedId(Long invalidatedId) 
+    {
+        this.invalidatedId = invalidatedId;
+    }
+
+    public Long getInvalidatedId() 
+    {
+        return invalidatedId;
+    }
+    public void setEpc(String epc) 
+    {
+        this.epc = epc;
+    }
+
+    public String getEpc() 
+    {
+        return epc;
+    }
+    public void setImgPath(String imgPath) 
+    {
+        this.imgPath = imgPath;
+    }
+
+    public String getImgPath() 
+    {
+        return imgPath;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("objid", getObjid())
+            .append("invalidatedId", getInvalidatedId())
+            .append("epc", getEpc())
+            .append("imgPath", getImgPath())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.manage.mapper;
+
+import java.util.List;
+import com.ruoyi.manage.domain.RecordInspectionImg;
+import org.springframework.stereotype.Repository;
+/**
+ * 巡检历史图片Mapper接口
+ *
+ * @author wangh
+ * @date 2024-09-27
+ */
+@Repository
+public interface RecordInspectionImgMapper
+{
+    /**
+     * 查询巡检历史图片
+     *
+     * @param inspectionId 巡检历史图片主键
+     * @return 巡检历史图片
+     */
+    public RecordInspectionImg selectRecordInspectionImgByInspectionId(Long inspectionId);
+
+    /**
+     * 查询巡检历史图片列表
+     *
+     * @param recordInspectionImg 巡检历史图片
+     * @return 巡检历史图片集合
+     */
+    public List<RecordInspectionImg> selectRecordInspectionImgList(RecordInspectionImg recordInspectionImg);
+
+    /**
+     * 新增巡检历史图片
+     *
+     * @param recordInspectionImg 巡检历史图片
+     * @return 结果
+     */
+    public int insertRecordInspectionImg(RecordInspectionImg recordInspectionImg);
+
+    /**
+     * 修改巡检历史图片
+     *
+     * @param recordInspectionImg 巡检历史图片
+     * @return 结果
+     */
+    public int updateRecordInspectionImg(RecordInspectionImg recordInspectionImg);
+
+    /**
+     * 删除巡检历史图片
+     *
+     * @param inspectionId 巡检历史图片主键
+     * @return 结果
+     */
+    public int deleteRecordInspectionImgByInspectionId(Long inspectionId);
+
+    /**
+     * 批量删除巡检历史图片
+     *
+     * @param inspectionIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRecordInspectionImgByInspectionIds(String[] inspectionIds);
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedImgMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.manage.mapper;
+
+import java.util.List;
+import com.ruoyi.manage.domain.RecordInvalidatedImg;
+import org.springframework.stereotype.Repository;
+/**
+ * 轮挡报废图片记录Mapper接口
+ *
+ * @author wangh
+ * @date 2024-09-27
+ */
+@Repository
+public interface RecordInvalidatedImgMapper
+{
+    /**
+     * 查询轮挡报废图片记录
+     *
+     * @param objid 轮挡报废图片记录主键
+     * @return 轮挡报废图片记录
+     */
+    public RecordInvalidatedImg selectRecordInvalidatedImgByObjid(Long objid);
+
+    /**
+     * 查询轮挡报废图片记录列表
+     *
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 轮挡报废图片记录集合
+     */
+    public List<RecordInvalidatedImg> selectRecordInvalidatedImgList(RecordInvalidatedImg recordInvalidatedImg);
+
+    /**
+     * 新增轮挡报废图片记录
+     *
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 结果
+     */
+    public int insertRecordInvalidatedImg(RecordInvalidatedImg recordInvalidatedImg);
+
+    /**
+     * 修改轮挡报废图片记录
+     *
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 结果
+     */
+    public int updateRecordInvalidatedImg(RecordInvalidatedImg recordInvalidatedImg);
+
+    /**
+     * 删除轮挡报废图片记录
+     *
+     * @param objid 轮挡报废图片记录主键
+     * @return 结果
+     */
+    public int deleteRecordInvalidatedImgByObjid(Long objid);
+
+    /**
+     * 批量删除轮挡报废图片记录
+     *
+     * @param objids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRecordInvalidatedImgByObjids(String[] objids);
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.manage.service;
+
+import java.util.List;
+import com.ruoyi.manage.domain.RecordInspectionImg;
+
+/**
+ * 巡检历史图片Service接口
+ * 
+ * @author wangh
+ * @date 2024-09-27
+ */
+public interface IRecordInspectionImgService 
+{
+    /**
+     * 查询巡检历史图片
+     * 
+     * @param inspectionId 巡检历史图片主键
+     * @return 巡检历史图片
+     */
+    public RecordInspectionImg selectRecordInspectionImgByInspectionId(Long inspectionId);
+
+    /**
+     * 查询巡检历史图片列表
+     * 
+     * @param recordInspectionImg 巡检历史图片
+     * @return 巡检历史图片集合
+     */
+    public List<RecordInspectionImg> selectRecordInspectionImgList(RecordInspectionImg recordInspectionImg);
+
+    /**
+     * 新增巡检历史图片
+     * 
+     * @param recordInspectionImg 巡检历史图片
+     * @return 结果
+     */
+    public int insertRecordInspectionImg(RecordInspectionImg recordInspectionImg);
+
+    /**
+     * 修改巡检历史图片
+     * 
+     * @param recordInspectionImg 巡检历史图片
+     * @return 结果
+     */
+    public int updateRecordInspectionImg(RecordInspectionImg recordInspectionImg);
+
+    /**
+     * 批量删除巡检历史图片
+     * 
+     * @param inspectionIds 需要删除的巡检历史图片主键集合
+     * @return 结果
+     */
+    public int deleteRecordInspectionImgByInspectionIds(String inspectionIds);
+
+    /**
+     * 删除巡检历史图片信息
+     * 
+     * @param inspectionId 巡检历史图片主键
+     * @return 结果
+     */
+    public int deleteRecordInspectionImgByInspectionId(Long inspectionId);
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedImgService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.manage.service;
+
+import java.util.List;
+import com.ruoyi.manage.domain.RecordInvalidatedImg;
+
+/**
+ * 轮挡报废图片记录Service接口
+ * 
+ * @author wangh
+ * @date 2024-09-27
+ */
+public interface IRecordInvalidatedImgService 
+{
+    /**
+     * 查询轮挡报废图片记录
+     * 
+     * @param objid 轮挡报废图片记录主键
+     * @return 轮挡报废图片记录
+     */
+    public RecordInvalidatedImg selectRecordInvalidatedImgByObjid(Long objid);
+
+    /**
+     * 查询轮挡报废图片记录列表
+     * 
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 轮挡报废图片记录集合
+     */
+    public List<RecordInvalidatedImg> selectRecordInvalidatedImgList(RecordInvalidatedImg recordInvalidatedImg);
+
+    /**
+     * 新增轮挡报废图片记录
+     * 
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 结果
+     */
+    public int insertRecordInvalidatedImg(RecordInvalidatedImg recordInvalidatedImg);
+
+    /**
+     * 修改轮挡报废图片记录
+     * 
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 结果
+     */
+    public int updateRecordInvalidatedImg(RecordInvalidatedImg recordInvalidatedImg);
+
+    /**
+     * 批量删除轮挡报废图片记录
+     * 
+     * @param objids 需要删除的轮挡报废图片记录主键集合
+     * @return 结果
+     */
+    public int deleteRecordInvalidatedImgByObjids(String objids);
+
+    /**
+     * 删除轮挡报废图片记录信息
+     * 
+     * @param objid 轮挡报废图片记录主键
+     * @return 结果
+     */
+    public int deleteRecordInvalidatedImgByObjid(Long objid);
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.manage.service.impl;
+
+import java.util.List;
+
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.manage.mapper.RecordInspectionImgMapper;
+import com.ruoyi.manage.domain.RecordInspectionImg;
+import com.ruoyi.manage.service.IRecordInspectionImgService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 巡检历史图片Service业务层处理
+ *
+ * @author wangh
+ * @date 2024-09-27
+ */
+@Service
+public class RecordInspectionImgServiceImpl implements IRecordInspectionImgService {
+    @Autowired
+    private RecordInspectionImgMapper recordInspectionImgMapper;
+
+    /**
+     * 查询巡检历史图片
+     *
+     * @param inspectionId 巡检历史图片主键
+     * @return 巡检历史图片
+     */
+    @Override
+    public RecordInspectionImg selectRecordInspectionImgByInspectionId(Long inspectionId) {
+        return recordInspectionImgMapper.selectRecordInspectionImgByInspectionId(inspectionId);
+    }
+
+    /**
+     * 查询巡检历史图片列表
+     *
+     * @param recordInspectionImg 巡检历史图片
+     * @return 巡检历史图片
+     */
+    @Override
+    public List<RecordInspectionImg> selectRecordInspectionImgList(RecordInspectionImg recordInspectionImg) {
+        return recordInspectionImgMapper.selectRecordInspectionImgList(recordInspectionImg);
+    }
+
+    /**
+     * 新增巡检历史图片
+     *
+     * @param recordInspectionImg 巡检历史图片
+     * @return 结果
+     */
+    @Override
+    public int insertRecordInspectionImg(RecordInspectionImg recordInspectionImg) {
+
+
+
+
+                recordInspectionImg.setCreateBy(ShiroUtils.getLoginName());
+                recordInspectionImg.setCreateTime(DateUtils.getNowDate());
+            return recordInspectionImgMapper.insertRecordInspectionImg(recordInspectionImg);
+    }
+
+    /**
+     * 修改巡检历史图片
+     *
+     * @param recordInspectionImg 巡检历史图片
+     * @return 结果
+     */
+    @Override
+    public int updateRecordInspectionImg(RecordInspectionImg recordInspectionImg) {
+        return recordInspectionImgMapper.updateRecordInspectionImg(recordInspectionImg);
+    }
+
+    /**
+     * 批量删除巡检历史图片
+     *
+     * @param inspectionIds 需要删除的巡检历史图片主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRecordInspectionImgByInspectionIds(String inspectionIds) {
+        return recordInspectionImgMapper.deleteRecordInspectionImgByInspectionIds(Convert.toStrArray(inspectionIds));
+    }
+
+    /**
+     * 删除巡检历史图片信息
+     *
+     * @param inspectionId 巡检历史图片主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRecordInspectionImgByInspectionId(Long inspectionId) {
+        return recordInspectionImgMapper.deleteRecordInspectionImgByInspectionId(inspectionId);
+    }
+}

ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedImgServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.manage.service.impl;
+
+import java.util.List;
+
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.manage.mapper.RecordInvalidatedImgMapper;
+import com.ruoyi.manage.domain.RecordInvalidatedImg;
+import com.ruoyi.manage.service.IRecordInvalidatedImgService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 轮挡报废图片记录Service业务层处理
+ *
+ * @author wangh
+ * @date 2024-09-27
+ */
+@Service
+public class RecordInvalidatedImgServiceImpl implements IRecordInvalidatedImgService {
+    @Autowired
+    private RecordInvalidatedImgMapper recordInvalidatedImgMapper;
+
+    /**
+     * 查询轮挡报废图片记录
+     *
+     * @param objid 轮挡报废图片记录主键
+     * @return 轮挡报废图片记录
+     */
+    @Override
+    public RecordInvalidatedImg selectRecordInvalidatedImgByObjid(Long objid) {
+        return recordInvalidatedImgMapper.selectRecordInvalidatedImgByObjid(objid);
+    }
+
+    /**
+     * 查询轮挡报废图片记录列表
+     *
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 轮挡报废图片记录
+     */
+    @Override
+    public List<RecordInvalidatedImg> selectRecordInvalidatedImgList(RecordInvalidatedImg recordInvalidatedImg) {
+        return recordInvalidatedImgMapper.selectRecordInvalidatedImgList(recordInvalidatedImg);
+    }
+
+    /**
+     * 新增轮挡报废图片记录
+     *
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 结果
+     */
+    @Override
+    public int insertRecordInvalidatedImg(RecordInvalidatedImg recordInvalidatedImg) {
+                recordInvalidatedImg.setCreateBy(ShiroUtils.getLoginName());
+                recordInvalidatedImg.setCreateTime(DateUtils.getNowDate());
+            return recordInvalidatedImgMapper.insertRecordInvalidatedImg(recordInvalidatedImg);
+    }
+
+    /**
+     * 修改轮挡报废图片记录
+     *
+     * @param recordInvalidatedImg 轮挡报废图片记录
+     * @return 结果
+     */
+    @Override
+    public int updateRecordInvalidatedImg(RecordInvalidatedImg recordInvalidatedImg) {
+        return recordInvalidatedImgMapper.updateRecordInvalidatedImg(recordInvalidatedImg);
+    }
+
+    /**
+     * 批量删除轮挡报废图片记录
+     *
+     * @param objids 需要删除的轮挡报废图片记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRecordInvalidatedImgByObjids(String objids) {
+        return recordInvalidatedImgMapper.deleteRecordInvalidatedImgByObjids(Convert.toStrArray(objids));
+    }
+
+    /**
+     * 删除轮挡报废图片记录信息
+     *
+     * @param objid 轮挡报废图片记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRecordInvalidatedImgByObjid(Long objid) {
+        return recordInvalidatedImgMapper.deleteRecordInvalidatedImgByObjid(objid);
+    }
+}

ruoyi-manage/src/main/resources/create_menu_sql/record_inspection_imgMenu.sql

@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('巡检历史图片', '2026', '1', '/manage/record_inspection_img', 'C', '0', 'manage:record_inspection_img:view', '#', 'admin', sysdate(), '', null, '巡检历史图片菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('巡检历史图片查询', @parentId, '1',  '#',  'F', '0', 'manage:record_inspection_img:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('巡检历史图片新增', @parentId, '2',  '#',  'F', '0', 'manage:record_inspection_img:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('巡检历史图片修改', @parentId, '3',  '#',  'F', '0', 'manage:record_inspection_img:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('巡检历史图片删除', @parentId, '4',  '#',  'F', '0', 'manage:record_inspection_img:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('巡检历史图片导出', @parentId, '5',  '#',  'F', '0', 'manage:record_inspection_img:export',       '#', 'admin', sysdate(), '', null, '');

ruoyi-manage/src/main/resources/create_menu_sql/record_invalidated_imgMenu.sql

@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮挡报废图片记录', '2026', '1', '/manage/record_invalidated_img', 'C', '0', 'manage:record_invalidated_img:view', '#', 'admin', sysdate(), '', null, '轮挡报废图片记录菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮挡报废图片记录查询', @parentId, '1',  '#',  'F', '0', 'manage:record_invalidated_img:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮挡报废图片记录新增', @parentId, '2',  '#',  'F', '0', 'manage:record_invalidated_img:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮挡报废图片记录修改', @parentId, '3',  '#',  'F', '0', 'manage:record_invalidated_img:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮挡报废图片记录删除', @parentId, '4',  '#',  'F', '0', 'manage:record_invalidated_img:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('轮挡报废图片记录导出', @parentId, '5',  '#',  'F', '0', 'manage:record_invalidated_img:export',       '#', 'admin', sysdate(), '', null, '');

ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.manage.mapper.RecordInspectionImgMapper">
+    
+    <resultMap type="RecordInspectionImg" id="RecordInspectionImgResult">
+        <result property="inspectionId"    column="inspection_id"    />
+        <result property="taskId"    column="task_id"    />
+        <result property="imgPath"    column="img_path"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectRecordInspectionImgVo">
+        select inspection_id, task_id, img_path, create_by, create_time from record_inspection_img
+    </sql>
+
+    <select id="selectRecordInspectionImgList" parameterType="RecordInspectionImg" resultMap="RecordInspectionImgResult">
+        <include refid="selectRecordInspectionImgVo"/>
+        <where>  
+            <if test="inspectionId != null "> and inspection_id = #{inspectionId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
+            <if test="imgPath != null  and imgPath != ''"> and img_path = #{imgPath}</if>
+        </where>
+    </select>
+    
+    <select id="selectRecordInspectionImgByInspectionId" parameterType="Long" resultMap="RecordInspectionImgResult">
+        <include refid="selectRecordInspectionImgVo"/>
+        where inspection_id = #{inspectionId}
+    </select>
+        
+    <insert id="insertRecordInspectionImg" parameterType="RecordInspectionImg">
+        insert into record_inspection_img
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inspectionId != null">inspection_id,</if>
+            <if test="taskId != null">task_id,</if>
+            <if test="imgPath != null">img_path,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inspectionId != null">#{inspectionId},</if>
+            <if test="taskId != null">#{taskId},</if>
+            <if test="imgPath != null">#{imgPath},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRecordInspectionImg" parameterType="RecordInspectionImg">
+        update record_inspection_img
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
+            <if test="imgPath != null">img_path = #{imgPath},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where inspection_id = #{inspectionId}
+    </update>
+
+    <delete id="deleteRecordInspectionImgByInspectionId" parameterType="Long">
+        delete from record_inspection_img where inspection_id = #{inspectionId}
+    </delete>
+
+    <delete id="deleteRecordInspectionImgByInspectionIds" parameterType="String">
+        delete from record_inspection_img where inspection_id in 
+        <foreach item="inspectionId" collection="array" open="(" separator="," close=")">
+            #{inspectionId}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedImgMapper.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.manage.mapper.RecordInvalidatedImgMapper">
+    
+    <resultMap type="RecordInvalidatedImg" id="RecordInvalidatedImgResult">
+        <result property="objid"    column="objid"    />
+        <result property="invalidatedId"    column="invalidated_id"    />
+        <result property="epc"    column="epc"    />
+        <result property="imgPath"    column="img_path"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectRecordInvalidatedImgVo">
+        select objid, invalidated_id, epc, img_path, create_by, create_time from record_invalidated_img
+    </sql>
+
+    <select id="selectRecordInvalidatedImgList" parameterType="RecordInvalidatedImg" resultMap="RecordInvalidatedImgResult">
+        <include refid="selectRecordInvalidatedImgVo"/>
+        <where>  
+            <if test="invalidatedId != null "> and invalidated_id = #{invalidatedId}</if>
+            <if test="epc != null  and epc != ''"> and epc = #{epc}</if>
+            <if test="imgPath != null  and imgPath != ''"> and img_path = #{imgPath}</if>
+        </where>
+    </select>
+    
+    <select id="selectRecordInvalidatedImgByObjid" parameterType="Long" resultMap="RecordInvalidatedImgResult">
+        <include refid="selectRecordInvalidatedImgVo"/>
+        where objid = #{objid}
+    </select>
+        
+    <insert id="insertRecordInvalidatedImg" parameterType="RecordInvalidatedImg" useGeneratedKeys="true" keyProperty="objid">
+        insert into record_invalidated_img
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="invalidatedId != null">invalidated_id,</if>
+            <if test="epc != null and epc != ''">epc,</if>
+            <if test="imgPath != null and imgPath != ''">img_path,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="invalidatedId != null">#{invalidatedId},</if>
+            <if test="epc != null and epc != ''">#{epc},</if>
+            <if test="imgPath != null and imgPath != ''">#{imgPath},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRecordInvalidatedImg" parameterType="RecordInvalidatedImg">
+        update record_invalidated_img
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="invalidatedId != null">invalidated_id = #{invalidatedId},</if>
+            <if test="epc != null and epc != ''">epc = #{epc},</if>
+            <if test="imgPath != null and imgPath != ''">img_path = #{imgPath},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where objid = #{objid}
+    </update>
+
+    <delete id="deleteRecordInvalidatedImgByObjid" parameterType="Long">
+        delete from record_invalidated_img where objid = #{objid}
+    </delete>
+
+    <delete id="deleteRecordInvalidatedImgByObjids" parameterType="String">
+        delete from record_invalidated_img where objid in 
+        <foreach item="objid" collection="array" open="(" separator="," close=")">
+            #{objid}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml

@@ -9,10 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="epc"    column="epc"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
+        <result property="reason"    column="reason"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectRecordInvalidatedVo">
-        select objid, epc, create_by, create_time from record_invalidated
+        select objid, epc, create_by, create_time,reason,remark from record_invalidated
     </sql>
 
     <select id="selectRecordInvalidatedList" parameterType="RecordInvalidated" resultMap="RecordInvalidatedResult">

ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增巡检历史图片')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-record_inspection_img-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">巡检id：</label>
+                <div class="col-sm-8">
+                    <input name="inspectionId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">任务表id：</label>
+                <div class="col-sm-8">
+                    <input name="taskId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">路径：</label>
+                <div class="col-sm-8">
+                    <input name="imgPath" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "manage/record_inspection_img"
+        $("#form-record_inspection_img-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-record_inspection_img-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/edit.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改巡检历史图片')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-record_inspection_img-edit" th:object="${recordInspectionImg}">
+            <input name="inspectionId" th:field="*{inspectionId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">巡检id：</label>
+                <div class="col-sm-8">
+                    <input name="inspectionId" th:field="*{inspectionId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">任务表id：</label>
+                <div class="col-sm-8">
+                    <input name="taskId" th:field="*{taskId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">路径：</label>
+                <div class="col-sm-8">
+                    <input name="imgPath" th:field="*{imgPath}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "manage/record_inspection_img";
+        $("#form-record_inspection_img-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-record_inspection_img-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/record_inspection_img.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('巡检历史图片列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>巡检id：</label>
+                                <input type="text" name="inspectionId"/>
+                            </li>
+                            <li>
+                                <label>任务表id：</label>
+                                <input type="text" name="taskId"/>
+                            </li>
+                            <li>
+                                <label>路径：</label>
+                                <input type="text" name="imgPath"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_img:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_inspection_img:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_inspection_img:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_inspection_img:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('manage:record_inspection_img:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('manage:record_inspection_img:remove')}]];
+        var prefix = ctx + "manage/record_inspection_img";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "巡检历史图片",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'inspectionId',
+                    title: '巡检id'
+                },
+                {
+                    field: 'taskId',
+                    title: '任务表id'
+                },
+                {
+                    field: 'imgPath',
+                    title: '路径'
+                },
+                {
+                    field: 'createBy',
+                    title: '上传人'
+                },
+                {
+                    field: 'createTime',
+                    title: '上传时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.inspectionId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.inspectionId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html

@@ -1,86 +1,99 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('巡检机位信息列表')" />
+    <th:block th:include="include :: header('巡检机位信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li hidden>
-                                <label>巡检id：</label>
-                                <input type="text" name="inspectionId" th:value="${inspetionId}" />
-                            </li>
-                            <li>
-                                <label>机坪名称：</label>
-                                <input type="text" name="areaName"/>
-                            </li>
-                            <li>
-                                <label>机位码：</label>
-                                <input type="text" name="planePosition"/>
-                            </li>
-                            <li>
-                                <label>完成状态：</label>
-                                <select name="taskState" th:with="type=${@dict.getType('inspetion_state')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li hidden>
+                            <label>巡检id：</label>
+                            <input type="text" name="inspectionId" th:value="${inspetionId}"/>
+                        </li>
+                        <li>
+                            <label>机坪名称：</label>
+                            <input type="text" name="areaName"/>
+                        </li>
+                        <li>
+                            <label>机位码：</label>
+                            <input type="text" name="planePosition"/>
+                        </li>
+                        <li>
+                            <label>完成状态：</label>
+                            <select name="taskState" th:with="type=${@dict.getType('inspetion_state')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_task:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_inspection_task:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_inspection_task:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_inspection_task:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()"
+               shiro:hasPermission="manage:record_inspection_task:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="manage:record_inspection_task:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="manage:record_inspection_task:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()"
+               shiro:hasPermission="manage:record_inspection_task:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('manage:record_inspection_task:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('manage:record_inspection_task:remove')}]];
-        var taskStateDatas = [[${@dict.getType('inspetion_state')}]];
-        var prefix = ctx + "manage/record_inspection_task";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('manage:record_inspection_task:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('manage:record_inspection_task:remove')}]];
+    var taskStateDatas = [[${@dict.getType('inspetion_state')}]];
+    var prefix = ctx + "manage/record_inspection_task";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "巡检机位信息",
-                // queryParams: queryParams,
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "巡检机位信息",
+            // queryParams: queryParams,
+            detailView: true,
+            onExpandRow: function (index, row, $detail) {
+                initinspectionTable(index, row, $detail);
+            },
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'objid',
                     title: '主键',
                     visible: false
                 },
+
+
                 {
                     field: 'areaName',
                     title: '机坪名称'
@@ -92,32 +105,70 @@
                 {
                     field: 'taskState',
                     title: '完成状态',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(taskStateDatas, value);
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(taskStateDatas, value);
                     }
                 },
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
+        };
+        $.table.init(options);
+    });
 
-        function queryParams() {
-            console.log("查询")
-            var search = $.table.queryParams(params);
+    function queryParams() {
+        console.log("查询")
+        var search = $.table.queryParams(params);
+        console.log(search)
+        return search;
+    }
 
-            console.log(search)
 
-            return search;
-        }
-    </script>
+    initinspectionTable = function (index, row, $detail) {
+        var childTable = $detail.html('<table style="table-layout:fixed"></table>').find('table');
+
+        $(childTable).bootstrapTable({
+            url: ctx + "manage/record_inspection_img/list",
+            method: 'post',
+            sidePagination: "server",
+            contentType: "application/x-www-form-urlencoded",
+            queryParams: {
+                taskId: row.objid
+            },
+            columns: [
+                {
+                    title: '序号',
+                    formatter: function (value, row, index) {
+                        return index + 1
+                    }
+                },
+
+                {
+                    field: 'imgPath',
+                    title: '路径',
+                    formatter: function (value, row, index) {
+
+                        return $.table.imageView(value, 818, 460, null);
+
+                    }
+                },
+                {
+                    field: 'createBy',
+                    title: '上传人'
+                },
+                {
+                    field: 'createTime',
+                    title: '上传时间'
+                }]
+        });
+    };
+</script>
 </body>
 </html>

ruoyi-manage/src/main/resources/templates/manage/record_invalidated/record_invalidated.html

@@ -1,76 +1,87 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('轮挡报废记录列表')" />
+    <th:block th:include="include :: header('轮挡报废记录列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>RFID：</label>
-                                <input type="text" name="epc"/>
-                            </li>
-                            <li>
-                                <label>操作人：</label>
-                                <input type="text" name="createBy"/>
-                            </li>
-                            <li class="select-time">
-                                <label>报废时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>RFID：</label>
+                            <input type="text" name="epc"/>
+                        </li>
+                        <li>
+                            <label>操作人：</label>
+                            <input type="text" name="createBy"/>
+                        </li>
+                        <li class="select-time">
+                            <label>报废时间：</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginCreateTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endCreateTime]"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_invalidated:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_invalidated:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_invalidated:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_invalidated:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+        <!--    <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_invalidated:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="manage:record_invalidated:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="manage:record_invalidated:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()"
+               shiro:hasPermission="manage:record_invalidated:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('manage:record_invalidated:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('manage:record_invalidated:remove')}]];
-        var prefix = ctx + "manage/record_invalidated";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('manage:record_invalidated:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('manage:record_invalidated:remove')}]];
+    var prefix = ctx + "manage/record_invalidated";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "轮挡报废记录",
-                sortOrder: "desc",
-                sortName : "createTime",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "轮挡报废记录",
+            sortOrder: "desc",
+            sortName: "createTime",
+            detailView: true,
+            onExpandRow: function (index, row, $detail) {
+                initinspectionTable(index, row, $detail);
+            },
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'objid',
                     title: '主键',
@@ -80,6 +91,15 @@
                     field: 'epc',
                     title: 'RFID'
                 },
+                {
+                    field: 'reason',
+                    title: '报废原因'
+                },
+                {
+                    field: 'remark',
+                    title: '其他说明'
+                },
+
                 {
                     field: 'createBy',
                     title: '操作人'
@@ -91,16 +111,55 @@
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
+        };
+        $.table.init(options);
+    });
+
+
+    initinspectionTable = function (index, row, $detail) {
+        var childTable = $detail.html('<table style="table-layout:fixed"></table>').find('table');
+
+        $(childTable).bootstrapTable({
+            url: ctx + "manage/record_invalidated_img/list",
+            method: 'post',
+            sidePagination: "server",
+            contentType: "application/x-www-form-urlencoded",
+            queryParams: {
+                invalidatedId: row.objid
+            },
+            columns: [
+                {
+                    title: '序号',
+                    formatter: function (value, row, index) {
+                        return index+1
+                    }
+                },
+                {
+                    field: 'epc',
+                    title: 'RFID'
+                },
+                {
+                    field: 'imgPath',
+                    title: '图片',
+                    formatter: function (value, row, index) {
+                        return $.table.imageView(value, 818, 460, null);
+
+                    }
+                },
+                {
+                    field: 'createBy',
+                    title: '创建人'
+                },
+               ]
         });
-    </script>
+    };
+</script>
 </body>
 </html>

ruoyi-manage/src/main/resources/templates/manage/record_invalidated_img/add.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增轮挡报废图片记录')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-record_invalidated_img-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">报废记录ID：</label>
+                <div class="col-sm-8">
+                    <input name="invalidatedId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">RFID：</label>
+                <div class="col-sm-8">
+                    <input name="epc" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">RFID：</label>
+                <div class="col-sm-8">
+                    <input name="imgPath" class="form-control" type="text" required>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "manage/record_invalidated_img"
+        $("#form-record_invalidated_img-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-record_invalidated_img-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-manage/src/main/resources/templates/manage/record_invalidated_img/edit.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改轮挡报废图片记录')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-record_invalidated_img-edit" th:object="${recordInvalidatedImg}">
+            <input name="objid" th:field="*{objid}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">报废记录ID：</label>
+                <div class="col-sm-8">
+                    <input name="invalidatedId" th:field="*{invalidatedId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">RFID：</label>
+                <div class="col-sm-8">
+                    <input name="epc" th:field="*{epc}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">RFID：</label>
+                <div class="col-sm-8">
+                    <input name="imgPath" th:field="*{imgPath}" class="form-control" type="text" required>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "manage/record_invalidated_img";
+        $("#form-record_invalidated_img-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-record_invalidated_img-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-manage/src/main/resources/templates/manage/record_invalidated_img/record_invalidated_img.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('轮挡报废图片记录列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>报废记录ID：</label>
+                                <input type="text" name="invalidatedId"/>
+                            </li>
+                            <li>
+                                <label>RFID：</label>
+                                <input type="text" name="epc"/>
+                            </li>
+                            <li>
+                                <label>RFID：</label>
+                                <input type="text" name="imgPath"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_invalidated_img:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_invalidated_img:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_invalidated_img:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_invalidated_img:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('manage:record_invalidated_img:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('manage:record_invalidated_img:remove')}]];
+        var prefix = ctx + "manage/record_invalidated_img";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "轮挡报废图片记录",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'objid',
+                    title: '主键',
+                    visible: false
+                },
+                {
+                    field: 'invalidatedId',
+                    title: '报废记录ID'
+                },
+                {
+                    field: 'epc',
+                    title: 'RFID'
+                },
+                {
+                    field: 'imgPath',
+                    title: 'RFID'
+                },
+                {
+                    field: 'createBy',
+                    title: '创建人'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>