对接问题修改

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

@@ -8,9 +8,11 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsMaterialsCheckPlan;
+import com.ktg.iscs.domain.IsMaterialsPlanCabinet;
 import com.ktg.iscs.domain.dto.checkPlan.AddCheckPlanDTO;
 import com.ktg.iscs.domain.dto.plan.PlanDTO;
 import com.ktg.iscs.service.IIsMaterialsCheckPlanService;
+import com.ktg.iscs.service.IIsMaterialsPlanCabinetService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -35,6 +37,8 @@ public class IsMaterialsCheckPlanController extends BaseController
 {
     @Autowired
     private IIsMaterialsCheckPlanService isMaterialsCheckPlanService;
+    @Autowired
+    private IIsMaterialsPlanCabinetService iIsMaterialsPlanCabinetService;
 
     @ApiOperation("查询物资检查计划-分页")
     @Parameters({
@@ -49,6 +53,15 @@ public class IsMaterialsCheckPlanController extends BaseController
         return CommonResult.success(result);
     }
 
+    @ApiOperation("查询物资检查计划柜子签名")
+    @PreAuthorize("@ss.hasPermi('iscs:plan:list')")
+    @GetMapping("/getCheckPlanCabinetList")
+    public CommonResult<List<IsMaterialsPlanCabinet>> getCheckPlanCabinetList(IsMaterialsPlanCabinet dto)
+    {
+        List<IsMaterialsPlanCabinet> result = iIsMaterialsPlanCabinetService.getCheckPlanCabinetList(dto);
+        return CommonResult.success(result);
+    }
+
     @ApiOperation("导出物资检查计划列表")
     @Parameter(name = "isMaterialsCheckPlan", description = "实体参数")
     @PreAuthorize("@ss.hasPermi('iscs:plan:export')")

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

@@ -1,6 +1,7 @@
 package com.ktg.iscs.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
@@ -84,7 +85,18 @@ public class IsMaterials extends BaseBean
     @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 
+    @ApiModelProperty(value = "属性数组，JSON 格式 [{propertId: , valueId: }, {propertId: , valueId: }]")
+    private String properties;
+
     @ApiModelProperty(value = "物资状态(0-正常 1-异常 2-被更换)")
     private String status;
 
+    @ApiModelProperty(value = "物资类型图标")
+    @TableField(exist = false)
+    private String materialsTypeIcon;
+
+    @ApiModelProperty(value = "物资类型缩略图")
+    @TableField(exist = false)
+    private String materialsTypePicture;
+
 }

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

@@ -52,5 +52,8 @@ public class IsMaterialsInstructions extends BaseBean
     @Excel(name = "物资状态(0-正常 1-异常 2-被更换)")
     private String status;
 
+    @ApiModelProperty(value = "排序")
+    private Integer orderNum;
+
 
 }

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

@@ -1,9 +1,13 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 物资检查计划关联物资柜对象 is_materials_plan_cabinet
  *
@@ -19,8 +23,22 @@ public class IsMaterialsPlanCabinet
     @ApiModelProperty(value = "物资计划ID")
     private Long planId;
 
+    @ApiModelProperty(value = "物资计划名称")
+    @TableField(exist = false)
+    private String planName;
+
     @ApiModelProperty(value = "物资柜ID")
     private Long cabinetId;
 
+    @ApiModelProperty(value = "物资柜Name")
+    @TableField(exist = false)
+    private String cabinetName;
+
+    @ApiModelProperty(value = "签名图片")
+    private String signatureImg;
+
+    @ApiModelProperty(value = "签名时间")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date signatureTime;
 
 }

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

@@ -72,5 +72,7 @@ public class IsMaterialsType extends BaseBean
     @ApiModelProperty(value = "状态")
     private String status;
 
+    @ApiModelProperty(value = "物资检查标准")
+    private String checkStandard;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/materialsType/MaterialsTypePageDTO.java

@@ -93,5 +93,8 @@ public class MaterialsTypePageDTO extends BaseBean
     @ApiModelProperty(value = "超时报警")
     private Integer timeoutAlarm;
 
+    @ApiModelProperty(value = "物资检查标准")
+    private String checkStandard;
+
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/materialsType/MaterialsTypePageVO.java

@@ -93,7 +93,7 @@ public class MaterialsTypePageVO extends BaseBean
     @ApiModelProperty(value = "超时报警")
     private Integer timeoutAlarm;
 
-
-
+    @ApiModelProperty(value = "物资检查标准")
+    private String checkStandard;
 
 }

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

@@ -1,10 +1,11 @@
 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.IsMaterialsPlanCabinet;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 物资检查计划关联物资柜Mapper接口
@@ -15,4 +16,6 @@ import com.ktg.iscs.domain.IsMaterialsPlanCabinet;
 @Mapper
 public interface IsMaterialsPlanCabinetMapper extends BaseMapperX<IsMaterialsPlanCabinet> {
 
+    List<IsMaterialsPlanCabinet> getCheckPlanCabinetList(@Param(value = "dto") IsMaterialsPlanCabinet dto);
+
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMaterialsPlanCabinet;
 
+import java.util.List;
+
 /**
  * 物资检查计划关联物资柜Service接口
  *
@@ -14,4 +16,6 @@ public interface IIsMaterialsPlanCabinetService extends IService<IsMaterialsPlan
 
     Page<IsMaterialsPlanCabinet> getIsMaterialsPlanCabinetPage(Page<IsMaterialsPlanCabinet> page, IsMaterialsPlanCabinet isMaterialsPlanCabinet);
 
+
+    List<IsMaterialsPlanCabinet> getCheckPlanCabinetList(IsMaterialsPlanCabinet dto);
 }

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

@@ -88,6 +88,15 @@ public class IsMaterialsCheckPlanServiceImpl extends ServiceImpl<IsMaterialsChec
         Assert.isFalse(dto.getCabinetIds().isEmpty(), "请选择需要检查的柜子!");
         // 2.开始新增计划
         IsMaterialsCheckPlan materialsCheckPlan = BeanUtils.toBean(dto, IsMaterialsCheckPlan.class);
+        // 2.1开始生成文件名称尾缀
+        String jobName = materialsCheckPlan.getPlanName();
+        int counter = 1;
+        String rname = materialsCheckPlan.getPlanName();
+        while (!list(Wrappers.<IsMaterialsCheckPlan>lambdaQuery().eq(IsMaterialsCheckPlan::getPlanName, jobName)).isEmpty()) {
+            jobName = rname + "(" + counter + ")";
+            counter++;
+        }
+        materialsCheckPlan.setPlanName(jobName);
         save(materialsCheckPlan);
         // 3.开始新增计划和物资柜的关联关系
         List<IsMaterialsPlanCabinet> isMaterialsPlanCabinets = new ArrayList<>();

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

@@ -9,6 +9,8 @@ import com.ktg.iscs.service.IIsMaterialsPlanCabinetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 物资检查计划关联物资柜Service业务层处理
  *
@@ -28,4 +30,9 @@ public class IsMaterialsPlanCabinetServiceImpl extends ServiceImpl<IsMaterialsPl
         return result;
     }
 
+    @Override
+    public List<IsMaterialsPlanCabinet> getCheckPlanCabinetList(IsMaterialsPlanCabinet dto) {
+        return isMaterialsPlanCabinetMapper.getCheckPlanCabinetList(dto);
+    }
+
 }

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

@@ -21,7 +21,6 @@ import com.ktg.iscs.mapper.IsMaterialsMapper;
 import com.ktg.iscs.service.IIsMaterialsLoanService;
 import com.ktg.iscs.service.IIsMaterialsService;
 import com.ktg.iscs.service.IIsMaterialsTypeService;
-import com.ktg.system.strategy.AutoCodeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,8 +42,6 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
     @Autowired
     private IIsMaterialsLoanService iIsMaterialsLoanService;
     @Autowired
-    private AutoCodeUtil autoCodeUtil;
-    @Autowired
     private IIsMaterialsTypeService iIsMaterialsTypeService;
 
     /**
@@ -55,7 +52,15 @@ public class IsMaterialsServiceImpl extends ServiceImpl<IsMaterialsMapper, IsMat
      */
     @Override
     public IsMaterials selectIsMaterialsByMaterialsId(Long materialsId) {
-        return isMaterialsMapper.selectIsMaterialsByMaterialsId(materialsId);
+        IsMaterials materials = isMaterialsMapper.selectIsMaterialsByMaterialsId(materialsId);
+        if (materials != null && materials.getMaterialsTypeId() != null) {
+            IsMaterialsType materialsType = iIsMaterialsTypeService.getById(materials.getMaterialsTypeId());
+            if (materialsType != null) {
+                materials.setMaterialsTypeIcon(materialsType.getMaterialsTypeIcon());
+                materials.setMaterialsTypePicture(materialsType.getMaterialsTypePicture());
+            }
+        }
+        return materials;
     }
 
     /**

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

@@ -22,6 +22,6 @@
                     and i.file_type = #{isMaterialsInstructions.fileType}
                 </if>
             </where>
-            order by i.instructions_id desc
+            order by i.order_num asc, i.instructions_id desc
     </select>
 </mapper>

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

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialsRfid"    column="materials_rfid"    />
         <result property="supplier"    column="supplier"    />
         <result property="expirationDate"    column="expiration_date"    />
+        <result property="properties"    column="properties"    />
     </resultMap>
 
     <sql id="selectIsMaterialsVo">
@@ -76,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialsRfid != null">materials_rfid,</if>
             <if test="supplier != null and supplier != ''">supplier,</if>
             <if test="expirationDate != null">expiration_date,</if>
+            <if test="properties != null and properties != ''">properties,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialsCode != null and materialsCode != ''">#{materialsCode},</if>
@@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialsRfid != null">#{materialsRfid},</if>
             <if test="supplier != null and supplier != ''">#{supplier},</if>
             <if test="expirationDate != null">#{expirationDate},</if>
+            <if test="properties != null and properties != ''">#{properties},</if>
          </trim>
     </insert>
 
@@ -124,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialsRfid != null">materials_rfid = #{materialsRfid},</if>
             <if test="supplier != null and supplier != ''">supplier = #{supplier},</if>
             <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
+            <if test="properties != null and properties != ''">properties = #{properties},</if>
         </trim>
         where materials_id = #{materialsId}
     </update>

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

@@ -4,4 +4,15 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsMaterialsPlanCabinetMapper">
 
+    <select id="getCheckPlanCabinetList" resultType="com.ktg.iscs.domain.IsMaterialsPlanCabinet">
+        select pc.*,
+               p.plan_name,
+               c. cabinet_name
+               from is_materials_plan_cabinet pc
+        left join is_materials_check_plan p on p.plan_id = pc. plan_id
+        left join is_materials_cabinet c on c.cabinet_id = pc.cabinet_id
+        <where>
+            pc.plan_id = #{dto.planId}
+        </where>
+    </select>
 </mapper>

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

@@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">status,</if>
             <if test="materialsTypeIcon != null and materialsTypeIcon != ''">materials_type_icon,</if>
             <if test="materialsTypePicture != null and materialsTypePicture != ''">materials_type_picture,</if>
+            <if test="checkStandard != null and checkStandard != ''">check_standard,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialsTypeCode != null and materialsTypeCode != ''">#{materialsTypeCode},</if>
@@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">#{status},</if>
             <if test="materialsTypeIcon != null and materialsTypeIcon != ''">#{materialsTypeIcon},</if>
             <if test="materialsTypePicture != null and materialsTypePicture != ''">#{materialsTypePicture},</if>
+            <if test="checkStandard != null and checkStandard != ''">#{checkStandard},</if>
          </trim>
     </insert>
 
@@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="materialsTypeIcon != null and materialsTypeIcon != ''">materials_type_icon = #{materialsTypeIcon},</if>
             <if test="materialsTypePicture != null and materialsTypePicture != ''">materials_type_picture = #{materialsTypePicture},</if>
+            <if test="checkStandard != null and checkStandard != ''">check_standard = #{checkStandard},</if>
         </trim>
         where materials_type_id = #{materialsTypeId}
     </update>

ktg-quartz/src/main/java/com/ktg/quartz/task/MaterialsLoanTask.java

@@ -31,6 +31,7 @@ public class MaterialsLoanTask {
                 .eq(IsMaterialsLoan::getRestitutionRequired, 1)
                 .lt(IsMaterialsLoan::getTimeoutAlarm, new Date())
                 .set(IsMaterialsLoan::getStatus, "2"));
+        log.info("扫描未归还  需要归还  已经过了告警事件任务完成！");
     }
 
 }