文件长传修改

ktg-admin/src/main/resources/application.yml

@@ -60,9 +60,9 @@ spring:
   servlet:
      multipart:
        # 单个文件大小
-       max-file-size:  10MB
+       max-file-size:  5000MB
        # 设置总上传的文件大小
-       max-request-size:  20MB
+       max-request-size:  5000MB
   # 服务模块
   devtools:
     restart:

ktg-common/src/main/java/com/ktg/common/utils/file/FileUploadUtils.java

@@ -1,14 +1,7 @@
 package com.ktg.common.utils.file;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Objects;
-
 import com.ktg.common.config.MinioConfig;
 import com.ktg.common.config.RuoYiConfig;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
 import com.ktg.common.constant.Constants;
 import com.ktg.common.exception.file.FileNameLengthLimitExceededException;
 import com.ktg.common.exception.file.FileSizeLimitExceededException;
@@ -16,6 +9,13 @@ import com.ktg.common.exception.file.InvalidExtensionException;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.common.utils.StringUtils;
 import com.ktg.common.utils.uuid.Seq;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
 
 /**
  * 文件上传工具类
@@ -27,7 +27,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 500 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsInstructionsController.java

@@ -0,0 +1,106 @@
+package com.ktg.iscs.controller;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsMaterialsInstructions;
+import com.ktg.iscs.service.IIsMaterialsInstructionsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 物资使用说明Controller
+ *
+ * @author cgj
+ * @date 2025-01-23
+ */
+@Api(tags = "物资使用说明")
+@RestController
+@RequestMapping("/iscs/instructions")
+public class IsMaterialsInstructionsController extends BaseController
+{
+    @Autowired
+    private IIsMaterialsInstructionsService isMaterialsInstructionsService;
+
+    @ApiOperation("查询物资使用说明-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isMaterialsInstructions", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:instructions:list')")
+    @GetMapping("/getIsMaterialsInstructionsPage")
+    public CommonResult<Page<IsMaterialsInstructions>> getIsMaterialsInstructionsPage(Page<IsMaterialsInstructions> page, IsMaterialsInstructions isMaterialsInstructions)
+    {
+        Page<IsMaterialsInstructions> result = isMaterialsInstructionsService.getIsMaterialsInstructionsPage(page, isMaterialsInstructions);
+        return CommonResult.success(result);
+    }
+
+    @ApiOperation("导出物资使用说明列表")
+    @Parameter(name = "isMaterialsInstructions", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:instructions:export')")
+    @Log(title = "物资使用说明", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsMaterialsInstructions")
+    public void exportIsMaterialsInstructions(HttpServletResponse response, IsMaterialsInstructions isMaterialsInstructions)
+    {
+        Page<IsMaterialsInstructions> page = new Page<>();
+        page.setSize(-1);
+        page.setCurrent(1);
+        List<IsMaterialsInstructions> list = isMaterialsInstructionsService.page(page, Wrappers.<IsMaterialsInstructions>lambdaQuery()
+                .orderByDesc(IsMaterialsInstructions::getInstructionsId)).getRecords();
+        ExcelUtil<IsMaterialsInstructions> util = new ExcelUtil<IsMaterialsInstructions>(IsMaterialsInstructions.class);
+        util.exportExcel(response, list, "物资使用说明数据");
+    }
+
+    @ApiOperation("获取物资使用说明详细信息")
+    @Parameter(name = "instructionsId", description = "instructionsId")
+    @PreAuthorize("@ss.hasPermi('iscs:instructions:query')")
+    @GetMapping(value = "/selectIsMaterialsInstructionsById")
+    public CommonResult<IsMaterialsInstructions> selectIsMaterialsInstructionsById(Long instructionsId)
+    {
+        return CommonResult.success(isMaterialsInstructionsService.getById(instructionsId));
+    }
+
+    @ApiOperation("新增物资使用说明")
+    @PreAuthorize("@ss.hasPermi('iscs:instructions:add')")
+    @Log(title = "物资使用说明", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsMaterialsInstructions")
+    public CommonResult<Boolean> insertIsMaterialsInstructions(@RequestBody @Parameter(name = "isMaterialsInstructions", description = "新增数据类,放到body") IsMaterialsInstructions isMaterialsInstructions)
+    {
+        return CommonResult.success(isMaterialsInstructionsService.save(isMaterialsInstructions));
+    }
+
+    @ApiOperation("修改物资使用说明")
+    @PreAuthorize("@ss.hasPermi('iscs:instructions:edit')")
+    @Log(title = "物资使用说明", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsMaterialsInstructions")
+    public CommonResult<Boolean> updateIsMaterialsInstructions(@RequestBody @Parameter(name = "isMaterialsInstructions", description = "修改数据类,放到body") IsMaterialsInstructions isMaterialsInstructions)
+    {
+        return CommonResult.success(isMaterialsInstructionsService.updateById(isMaterialsInstructions));
+    }
+
+    @ApiOperation("删除物资使用说明")
+    @PreAuthorize("@ss.hasPermi('iscs:instructions:remove')")
+    @Log(title = "物资使用说明", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsMaterialsInstructionsByInstructionsIds")
+    public CommonResult<Boolean> deleteIsMaterialsInstructionsByInstructionsIds(String instructionsIds)
+    {
+        Assert.notBlank(instructionsIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(instructionsIds);
+        return CommonResult.success(isMaterialsInstructionsService.removeBatchByIds(Arrays.asList(longIds)));
+    }
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsInstructions.java

@@ -0,0 +1,56 @@
+package com.ktg.iscs.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+
+/**
+ * 物资使用说明对象 is_materials_instructions
+ *
+ * @author cgj
+ * @date 2025-01-23
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsMaterialsInstructions extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "说明ID")
+    @TableId(type = IdType.AUTO)
+    private Long instructionsId;
+
+    @ApiModelProperty(value = "标题")
+    @Excel(name = "标题")
+    private String instructionsTitle;
+
+    @ApiModelProperty(value = "物资类型ID")
+    @Excel(name = "物资类型ID")
+    private Long materialsTypeId;
+
+    @ApiModelProperty(value = "物资类型NAME")
+    @TableField(exist = false)
+    private String materialsTypeName;
+
+    @ApiModelProperty(value = "文件地址")
+    @Excel(name = "文件地址")
+    private String fileUrl;
+
+    @ApiModelProperty(value = "文件类型")
+    @Excel(name = "文件类型")
+    private String fileType;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @ApiModelProperty(value = "物资状态(0-正常 1-异常 2-被更换)")
+    @Excel(name = "物资状态(0-正常 1-异常 2-被更换)")
+    private String status;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/hardwareApi/JobTicketLockVO.java

@@ -29,6 +29,9 @@ public class JobTicketLockVO extends BaseBean
     @ApiModelProperty(value = "锁具ID")
     private Long lockId;
 
+    @ApiModelProperty(value = "挂锁nfc")
+    private String lockNfc;
+
     @ApiModelProperty(value = "取出硬件ID")
     private Long fromHardwareId;
 

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsJobTicketLockMapper.java

@@ -1,9 +1,12 @@
 package com.ktg.iscs.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsJobTicketLock;
+import com.ktg.iscs.domain.vo.hardwareApi.JobTicketLockVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 作业票关联锁Mapper接口
@@ -61,4 +64,6 @@ public interface IsJobTicketLockMapper extends BaseMapperX<IsJobTicketLock>
      * @return 结果
      */
     int deleteIsJobTicketLockByRecordIds(Long[] recordIds);
+
+    List<JobTicketLockVO> getTicketLockByTicketId(@Param(value = "ticketId") Long ticketId);
 }

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMaterialsInstructionsMapper.java

@@ -0,0 +1,20 @@
+package com.ktg.iscs.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.mapper.BaseMapperX;
+import com.ktg.iscs.domain.IsMaterialsInstructions;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 物资使用说明Mapper接口
+ *
+ * @author cgj
+ * @date 2025-01-23
+ */
+@Mapper
+public interface IsMaterialsInstructionsMapper extends BaseMapperX<IsMaterialsInstructions> {
+
+    Page<IsMaterialsInstructions> getIsMaterialsInstructionsPage(Page<IsMaterialsInstructions> page, @Param(value = "isMaterialsInstructions") IsMaterialsInstructions isMaterialsInstructions);
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsJobTicketLockService.java

@@ -1,8 +1,10 @@
 package com.ktg.iscs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
 import com.ktg.iscs.domain.IsJobTicketLock;
+import com.ktg.iscs.domain.vo.hardwareApi.JobTicketLockVO;
+
+import java.util.List;
 
 /**
  * 作业票关联锁Service接口
@@ -61,4 +63,6 @@ public interface IIsJobTicketLockService extends IService<IsJobTicketLock>
     int deleteIsJobTicketLockByRecordId(Long recordId);
 
     List<IsJobTicketLock> selectByTicketId(Long ticketId);
+
+    List<JobTicketLockVO> getTicketLockByTicketId(Long ticketId);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMaterialsInstructionsService.java

@@ -0,0 +1,17 @@
+package com.ktg.iscs.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ktg.iscs.domain.IsMaterialsInstructions;
+
+/**
+ * 物资使用说明Service接口
+ *
+ * @author cgj
+ * @date 2025-01-23
+ */
+public interface IIsMaterialsInstructionsService extends IService<IsMaterialsInstructions> {
+
+    Page<IsMaterialsInstructions> getIsMaterialsInstructionsPage(Page<IsMaterialsInstructions> page, IsMaterialsInstructions isMaterialsInstructions);
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/HardwareApiServiceImpl.java

@@ -554,9 +554,10 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                 .eq(IsJobTicketKey::getTicketId, ticketId));
         List<JobTicketKeyVO> ticketKeyVOList = BeanUtils.toBean(ticketKeyList, JobTicketKeyVO.class);
         // 3.查询挂锁数据
-        List<IsJobTicketLock> jobTicketLockList = iIsJobTicketLockService.list(Wrappers.<IsJobTicketLock>lambdaQuery()
+        /*List<IsJobTicketLock> jobTicketLockList = iIsJobTicketLockService.list(Wrappers.<IsJobTicketLock>lambdaQuery()
                 .eq(IsJobTicketLock::getTicketId, ticketId));
-        List<JobTicketLockVO> ticketLockVOList = BeanUtils.toBean(jobTicketLockList, JobTicketLockVO.class);
+        List<JobTicketLockVO> ticketLockVOList = BeanUtils.toBean(jobTicketLockList, JobTicketLockVO.class);*/
+        List<JobTicketLockVO> ticketLockVOList = iIsJobTicketLockService.getTicketLockByTicketId(ticketId);
         // 4.查询辅件数据
         List<IsJobTicketLockset> jobTicketLocksetList = iIsJobTicketLocksetService.list(Wrappers.<IsJobTicketLockset>lambdaQuery()
                 .eq(IsJobTicketLockset::getJobTicketId, ticketId));

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketLockServiceImpl.java

@@ -1,15 +1,17 @@
 package com.ktg.iscs.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsJobTicketLockMapper;
 import com.ktg.iscs.domain.IsJobTicketLock;
+import com.ktg.iscs.domain.vo.hardwareApi.JobTicketLockVO;
+import com.ktg.iscs.mapper.IsJobTicketLockMapper;
 import com.ktg.iscs.service.IIsJobTicketLockService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 作业票关联锁Service业务层处理
@@ -103,4 +105,9 @@ public class IsJobTicketLockServiceImpl extends ServiceImpl<IsJobTicketLockMappe
     public List<IsJobTicketLock> selectByTicketId(Long ticketId) {
         return isJobTicketLockMapper.selectList(IsJobTicketLock::getTicketId, ticketId);
     }
+
+    @Override
+    public List<JobTicketLockVO> getTicketLockByTicketId(Long ticketId) {
+        return isJobTicketLockMapper.getTicketLockByTicketId(ticketId);
+    }
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsInstructionsServiceImpl.java

@@ -0,0 +1,29 @@
+package com.ktg.iscs.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.iscs.domain.IsMaterialsInstructions;
+import com.ktg.iscs.mapper.IsMaterialsInstructionsMapper;
+import com.ktg.iscs.service.IIsMaterialsInstructionsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 物资使用说明Service业务层处理
+ *
+ * @author cgj
+ * @date 2025-01-23
+ */
+@Service
+public class IsMaterialsInstructionsServiceImpl extends ServiceImpl<IsMaterialsInstructionsMapper, IsMaterialsInstructions> implements IIsMaterialsInstructionsService {
+
+    @Autowired
+    private IsMaterialsInstructionsMapper isMaterialsInstructionsMapper;
+
+    @Override
+    public Page<IsMaterialsInstructions> getIsMaterialsInstructionsPage(Page<IsMaterialsInstructions> page, IsMaterialsInstructions isMaterialsInstructions) {
+        Page<IsMaterialsInstructions> result = isMaterialsInstructionsMapper.getIsMaterialsInstructionsPage(page, isMaterialsInstructions);
+        return result;
+    }
+
+}

ktg-iscs/src/main/resources/mapper/IsJobTicketLockMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsJobTicketLockMapper">
-    
+
     <resultMap type="IsJobTicketLock" id="IsJobTicketLockResult">
         <result property="recordId"    column="record_id"    />
         <result property="ticketId"    column="ticket_id"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsJobTicketLockList" parameterType="IsJobTicketLock" resultMap="IsJobTicketLockResult">
         <include refid="selectIsJobTicketLockVo"/>
-        <where>  
+        <where>
             <if test="ticketId != null "> and ticket_id = #{ticketId}</if>
             <if test="lockId != null "> and lock_id = #{lockId}</if>
             <if test="fromHardwareId != null "> and from_hardware_id = #{fromHardwareId}</if>
@@ -35,12 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lockStatus != null  and lockStatus != ''"> and lock_status = #{lockStatus}</if>
         </where>
     </select>
-    
+
     <select id="selectIsJobTicketLockByRecordId" parameterType="Long" resultMap="IsJobTicketLockResult">
         <include refid="selectIsJobTicketLockVo"/>
         where record_id = #{recordId}
     </select>
-        
+
     <insert id="insertIsJobTicketLock" parameterType="IsJobTicketLock" useGeneratedKeys="true" keyProperty="recordId">
         insert into is_job_ticket_lock
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -97,9 +97,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsJobTicketLockByRecordIds" parameterType="String">
-        delete from is_job_ticket_lock where record_id in 
+        delete from is_job_ticket_lock where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getTicketLockByTicketId" resultType="com.ktg.iscs.domain.vo.hardwareApi.JobTicketLockVO">
+        select j.*, l.lock_nfc
+        from is_job_ticket_lock j
+            left join is_lock l on l.lock_id = j.lock_id
+        where j.ticket_id = #{ticketId}
+    </select>
+</mapper>

ktg-iscs/src/main/resources/mapper/IsMaterialsInstructionsMapper.xml

@@ -0,0 +1,27 @@
+<?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.ktg.iscs.mapper.IsMaterialsInstructionsMapper">
+
+    <select id="getIsMaterialsInstructionsPage" resultType="com.ktg.iscs.domain.IsMaterialsInstructions">
+        SELECT
+            i.*,
+            t.materials_type_name
+        FROM
+            is_materials_instructions i
+            LEFT JOIN is_materials_type t ON t.materials_type_id = i.materials_type_id
+            <where>
+                <if test="isMaterialsInstructions.instructionsTitle != null and isMaterialsInstructions.instructionsTitle.trim != ''">
+                    and i.instructions_title like concat('%',#{isMaterialsInstructions.instructionsTitle},'%')
+                </if>
+                <if test="isMaterialsInstructions.materialsTypeId != null">
+                    and i.materials_type_id = #{isMaterialsInstructions.materialsTypeId}
+                </if>
+                <if test="isMaterialsInstructions.fileType != null and isMaterialsInstructions.fileType.trim != ''">
+                    and i.file_type = #{isMaterialsInstructions.fileType}
+                </if>
+            </where>
+            order by i.instructions_id desc
+    </select>
+</mapper>