设备和场地

liujun001
1 parent aba59a0d
Showing 10 changed files with 60 additions and 52 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/dto/YarnCabinetStatePageDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/equipment/self/check/LingangEquimentSelfCheck.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/resource/LinggangSignInResource.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/UploadUtil.java
Bsth-admin/src/main/resources/mapper/driver/NewDriverMapper.xml
Bsth-admin/src/main/resources/mapper/equipment/LingangEquimentSelfCheckMapper.xml
Bsth-admin/src/main/resources/mapper/sign/in/resourc/LinggangSignInResourceMapper.xml
@@ -163,7 +163,7 @@ public class KeyBoxController extends BaseController {
             List<Equipment> equipmentList = equipmentService.list(eq);
             LinggangVenueInfo venueInfo = venueInfoService.getById(equipment.getYardId());
-            if(Objects.isNull(venueInfo)){
+            if (Objects.isNull(venueInfo)) {
                 logger.info("根据DTO的数据无法查询场站信息:[{}]", dto);
                 return ResponseResult.error404();
             }
@@ -199,7 +199,7 @@ public class KeyBoxController extends BaseController {
                 return ResponseResult.error404();
             }
-            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo,equipmentList);
+            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
             logger.error("钥匙柜基础信息同步异常:[{}]", dto, e);
@@ -234,7 +234,7 @@ public class KeyBoxController extends BaseController {
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        List<LinggangKeyWorkLocation> locations = convert(dto,schedulings);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -254,7 +254,7 @@ public class KeyBoxController extends BaseController {
         entity.setDevice(dto.getDevice());
         List<LinggangKeyWorkLocation> schedulings = linggangKeyWorkLocationService.list(entity);
-        List<LinggangKeyWorkLocation> locations = convert(dto,schedulings);
+        List<LinggangKeyWorkLocation> locations = convert(dto, schedulings);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
@@ -296,7 +296,7 @@ public class KeyBoxController extends BaseController {
         }
         location.setType(255);
-        location.setScheduleDate(locations.get(0).getScheduleDate());
+        location.setStartScheduleDate(locations.get(0).getScheduleDate());
         int errorCount = linggangKeyWorkLocationService.countId(location);
         location.setType(0);
@@ -310,13 +310,13 @@ public class KeyBoxController extends BaseController {
         LinggangKeyWorkLocation locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
-        locationEq.setScheduleDate(locations.get(0).getScheduleDate());
+        locationEq.setStartScheduleDate(locations.get(0).getScheduleDate());
         List<LinggangKeyWorkLocation> locationsOfEq = linggangKeyWorkLocationService.list(locationEq);
         locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
-        locationEq.setEndScheduleDate(locations.get(0).getScheduleDate());
+        locationEq.setStartScheduleDate(locations.get(0).getScheduleDate());
         IPage<LinggangKeyWorkLocation> page = linggangKeyWorkLocationService.pageList(new Page<>(dto.getPageNum(), dto.getPageSize()), locationEq, new OrderEntity());
         List<LinggangScheduling> schedulings = Collections.emptyList();
@@ -480,7 +480,7 @@ public class KeyBoxController extends BaseController {
         vo.setDevice(equipment.getDeviceId());
         vo.setDeviceType(equipment.getPromise());
         vo.setTime(workLocations.get(0).getScheduleDate());
-        if(Objects.nonNull(venueInfo)) {
+        if (Objects.nonNull(venueInfo)) {
             vo.setYardName(venueInfo.getName());
         }
         vo.setKeyboxName(equipment.getName());
@@ -532,7 +532,7 @@ public class KeyBoxController extends BaseController {
                         planVo.setTimePlate(planTimePlateVo);
                         return planVo;
-                    }).filter(obj->Objects.nonNull(obj)).collect(Collectors.toList());
+                    }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
                     driverPlanVo.setDriverPlan(planVos);
                 }
@@ -554,7 +554,7 @@ public class KeyBoxController extends BaseController {
         return vo;
     }
-    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto,List<LinggangKeyWorkLocation> schedulings) {
+    private List<LinggangKeyWorkLocation> convert(TakeKeyDTO dto, List<LinggangKeyWorkLocation> schedulings) {
         if (CollectionUtils.isEmpty(dto.getKeyItem())) {
             return Collections.emptyList();
         }
@@ -566,15 +566,15 @@ public class KeyBoxController extends BaseController {
             location.setKey(item.getKey());
             location.setScheduleDate(DateUtil.shortDate(dto.getTime()));
             location.setType(item.getState());
-            if(CollectionUtils.isNotEmpty(schedulings)){
-               Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s->Objects.equals(item.getKey(),s.getCabinetNo())).findFirst();
-               if(opt.isPresent()){
-                   location.setKeyInfoId(opt.get().getKeyInfoId());
-               }
+            if (CollectionUtils.isNotEmpty(schedulings)) {
+                Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
+                if (opt.isPresent()) {
+                    location.setKeyInfoId(opt.get().getKeyInfoId());
+                }
             }
             return location;
-        }).filter(obj->Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
+        }).filter(obj -> Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
     }
     private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result) {
@@ -619,22 +619,20 @@ public class KeyBoxController extends BaseController {
                 for (int i = 0; i < count; i++) {
                     YarnCabinetStatePageCabinetsKeysVO keysVO = new YarnCabinetStatePageCabinetsKeysVO();
                     keysVO.setCabinetNo(Convert.toStr(i + 1));
-                    if (CollectionUtils.isEmpty(locationsOfEqs)) {
-                        keysVO.setState(2);
-                    } else {
+                    keysVO.setState(2);
+                    if (CollectionUtils.isNotEmpty(locationsOfEqs)) {
                         Optional<LinggangKeyWorkLocation> optional = locationsOfEqs.stream().filter(l -> Objects.equals(l.getDevice(), eq.getDeviceId()) &&
                                 Objects.equals(keysVO.getCabinetNo(), l.getCabinetNo())).findFirst();
+
                         if (optional.isPresent()) {
                             if (Objects.equals(255, optional.get().getType())) {
                                 keysVO.setState(255);
-                            } else if (Objects.equals(0, optional.get().getType())) {
+                            } else if ((Objects.equals(0, optional.get().getType())||Objects.equals(2, optional.get().getType()))) {
                                 keysVO.setState(1);
-                            } else {
-                                keysVO.setState(2);
                             }
-
                         }
                     }
+                    keys.add(keysVO);
                 }
                 cabinetsVO.setKeys(keys);
@@ -657,6 +655,7 @@ public class KeyBoxController extends BaseController {
                         Optional<LinggangScheduling> optional = schedulings.stream().filter(sc -> Objects.equals(l.getSchedulingId(), sc.getId())).findFirst();
                         if (optional.isPresent()) {
                             recordsVo.setRouteName(optional.get().getLineName());
+                            recordsVo.setSelfCode(optional.get().getNbbm());
                             if (CollectionUtils.isNotEmpty(carInfos)) {
                                 Optional<CarInfo> optCar = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), optional.get().getNbbm())).findFirst();
                                 if (optCar.isPresent()) {
@@ -139,7 +139,7 @@ public class NewDriver {
     /***同步结果状态;0成功，1失败*/
     @Excel(name = "同步结果状态;0成功，1失败")
-    @TableField(value = "`integer`")
+    @TableField(value = "driver_integer")
     private java.lang.Integer integer;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 /**
  * @author liujun
@@ -27,11 +28,11 @@ public class YarnCabinetStatePageDTO implements java.io.Serializable {
     @ApiModelProperty(value = "车牌号")
     private String plate;
-    @NotEmpty(message = "每页条数不能为空")
+    @NotNull(message = "每页条数不能为空")
     @ApiModelProperty(value = "钥匙领取记录，每页条数", required = true, example = "1")
     private Integer pageSize;
-    @NotEmpty(message = "第几页不能为空")
+    @NotNull(message = "第几页不能为空")
     @ApiModelProperty(value = "钥匙领取记录，第几页", required = true, example = "1")
     private Integer pageNum;
@@ -68,12 +68,13 @@ public class LingangEquimentSelfCheck {
     /***锁控状态   1正常，2故障，null/3未检测到*/
     @Excel(name = "锁控状态   1正常，2故障，null/3未检测到")
-    @TableField(value = "`lock`")
+    @TableField(value = "equiment_self_lock")
     private java.lang.Integer lock;
     /***设备传过来的时间*/
     @Excel(name = "设备传过来的时间")
+    @TableField(value = "equiment_self_time")
     private java.util.Date time;
@@ -35,6 +35,7 @@ public class LinggangSignInResource {
     /***顺序*/
     @Excel(name = "顺序")
+    @TableField(value = "sign_in_resource_index")
     private Integer index;
@@ -103,7 +103,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     @Override
     public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
-        return list(new LambdaQueryWrapper<>(entity));
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        switchTime(entity,wrapper);
+        return list(wrapper);
     }
     @Override
@@ -133,14 +135,14 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Collection<Integer> keyIds, Date date) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
         if (Objects.nonNull(date)) {
-            wrapper.lt(LinggangKeyWorkLocation::getScheduleDate, date);
+            wrapper.le(LinggangKeyWorkLocation::getScheduleDate, date);
         }
         if (CollectionUtils.isNotEmpty(keyIds)) {
             wrapper.in(LinggangKeyWorkLocation::getKeyInfoId, keyIds);
         }
         List<LinggangKeyWorkLocation> locations = list(wrapper);
-        return chooseRecent(locations, date);
+        return locations;
     }
     @Override
@@ -185,6 +187,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public Integer countId(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(LinggangKeyWorkLocation::getId);
+        switchTime(entity,wrapper);
         return count(wrapper);
     }
@@ -3,6 +3,7 @@ package com.ruoyi.utils;
 import cn.hutool.core.codec.Base64;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.config.BsthSystemConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
@@ -46,6 +47,7 @@ public class UploadUtil {
         ByteArrayInputStream inputStream = null;
         BufferedImage bufferedImage = null;
         try {
+            content = FileUploadUtils.choosePrictureContent(content);
             byte[] bytes = Base64.decode(content);
             inputStream = new ByteArrayInputStream(bytes);
             bufferedImage = ImageIO.read(inputStream);
@@ -93,6 +95,7 @@ public class UploadUtil {
         FileOutputStream outputStream = null;
         try {
+            content = FileUploadUtils.choosePrictureContent(content);
             byte[] bytes = Base64.decode(content);
             StringBuilder filePath = new StringBuilder();
@@ -26,7 +26,7 @@
         <result column="fleet_name" jdbcType="VARCHAR" property="fleetName"/>
         <result column="face_Feature" jdbcType="VARCHAR" property="faceFeature"/>
         <result column="blue_Tooth" jdbcType="VARCHAR" property="blueTooth"/>
-        <result column="integer" jdbcType="INTEGER" property="integer"/>
+        <result column="driver_integer" jdbcType="INTEGER" property="integer"/>
         <result column="synContent" jdbcType="VARCHAR" property="syncontent"/>
         <result column="csn" jdbcType="VARCHAR" property="csn"/>
         <result column="image_version" jdbcType="VARCHAR" property="imageVersion"/>
@@ -41,12 +41,12 @@
     <sql id="columns">
         id
-        ,  job_code   ,  company_code   ,  branche_company_code   ,  personnel_name   ,  papers_code   ,  ic_card_code   ,  personnel_type   ,  posts   ,  card   ,  telphone   ,  ic_rfid   ,  id_rfid   ,  tag_rfid   ,  remark   ,  line_name   ,  line_code   ,  face_sign_in   ,  image   ,  update_time   ,  sign_in_equipment   ,  fleet_name   ,  face_Feature   ,  blue_Tooth   ,  integer   ,  synContent   ,  csn   ,  image_version
+        ,  job_code   ,  company_code   ,  branche_company_code   ,  personnel_name   ,  papers_code   ,  ic_card_code   ,  personnel_type   ,  posts   ,  card   ,  telphone   ,  ic_rfid   ,  id_rfid   ,  tag_rfid   ,  remark   ,  line_name   ,  line_code   ,  face_sign_in   ,  image   ,  update_time   ,  sign_in_equipment   ,  fleet_name   ,  face_Feature   ,  blue_Tooth   ,  driver_integer   ,  synContent   ,  csn   ,  image_version
     </sql>
     <sql id="insert_columns">
         id
-        ,  job_code  ,  company_code  ,  branche_company_code  ,  personnel_name  ,  papers_code  ,  ic_card_code  ,  personnel_type  ,  posts  ,  card  ,  telphone  ,  ic_rfid  ,  id_rfid  ,  tag_rfid  ,  remark  ,  line_name  ,  line_code  ,  face_sign_in  ,  image  ,  update_time  ,  sign_in_equipment  ,  fleet_name  ,  face_Feature  ,  blue_Tooth  ,  integer  ,  synContent  ,  csn  ,  image_version
+        ,  job_code  ,  company_code  ,  branche_company_code  ,  personnel_name  ,  papers_code  ,  ic_card_code  ,  personnel_type  ,  posts  ,  card  ,  telphone  ,  ic_rfid  ,  id_rfid  ,  tag_rfid  ,  remark  ,  line_name  ,  line_code  ,  face_sign_in  ,  image  ,  update_time  ,  sign_in_equipment  ,  fleet_name  ,  face_Feature  ,  blue_Tooth  ,  driver_integer  ,  synContent  ,  csn  ,  image_version
     </sql>
     <sql id="insert_values">
@@ -107,7 +107,7 @@
             <if test="null!=fleetName">fleet_name,</if>
             <if test="null!=faceFeature">face_Feature,</if>
             <if test="null!=blueTooth">blue_Tooth,</if>
-            <if test="null!=integer">integer,</if>
+            <if test="null!=integer">driver_integer,</if>
             <if test="null!=syncontent">synContent,</if>
             <if test="null!=csn">csn,</if>
             <if test="null!=imageVersion">image_version,</if>
@@ -173,7 +173,7 @@
             <if test="null!=fleetName">fleet_name = #{fleetName,jdbcType=VARCHAR},</if>
             <if test="null!=faceFeature">face_Feature = #{faceFeature,jdbcType=VARCHAR},</if>
             <if test="null!=blueTooth">blue_Tooth = #{blueTooth,jdbcType=VARCHAR},</if>
-            <if test="null!=integer">integer = #{integer,jdbcType=INTEGER},</if>
+            <if test="null!=integer">driver_integer = #{integer,jdbcType=INTEGER},</if>
             <if test="null!=syncontent">synContent = #{syncontent,jdbcType=VARCHAR},</if>
             <if test="null!=csn">csn = #{csn,jdbcType=VARCHAR},</if>
             <if test="null!=imageVersion">image_version = #{imageVersion,jdbcType=VARCHAR},</if>
@@ -205,7 +205,7 @@
         <if test="null!=fleetName">AND fleet_name = #{fleetName,jdbcType=VARCHAR},</if>
         <if test="null!=faceFeature">AND face_Feature = #{faceFeature,jdbcType=VARCHAR},</if>
         <if test="null!=blueTooth">AND blue_Tooth = #{blueTooth,jdbcType=VARCHAR},</if>
-        <if test="null!=integer">AND integer = #{integer,jdbcType=INTEGER},</if>
+        <if test="null!=integer">AND driver_integer = #{integer,jdbcType=INTEGER},</if>
         <if test="null!=syncontent">AND synContent = #{syncontent,jdbcType=VARCHAR},</if>
         <if test="null!=csn">AND csn = #{csn,jdbcType=VARCHAR},</if>
         <if test="null!=imageVersion">AND image_version = #{imageVersion,jdbcType=VARCHAR},</if>
@@ -10,8 +10,8 @@
         <result column="therm" jdbcType="INTEGER" property="therm"/>
         <result column="horn" jdbcType="INTEGER" property="horn"/>
         <result column="mike" jdbcType="INTEGER" property="mike"/>
-        <result column="lock" jdbcType="INTEGER" property="lock"/>
-        <result column="time" jdbcType="TIMESTAMP" property="time"/>
+        <result column="equiment_self_lock" jdbcType="INTEGER" property="lock"/>
+        <result column="equiment_self_time" jdbcType="TIMESTAMP" property="time"/>
         <result column="deviceType" jdbcType="VARCHAR" property="devicetype"/>
         <result column="isKeybox" jdbcType="BIT" property="iskeybox"/>
         <result column="quipment_exception_id" jdbcType="INTEGER" property="quipmentExceptionId"/>
@@ -30,12 +30,12 @@
     <sql id="columns">
         id
-        ,  device   ,  app_version   ,  wine   ,  cameras   ,  therm   ,  horn   ,  mike   ,  lock   ,  ·time ·  ,  deviceType   ,  isKeybox   ,  quipment_exception_id   ,  create_by   ,  create_time   ,  update_by   ,  update_time
+        ,  device   ,  app_version   ,  wine   ,  cameras   ,  therm   ,  horn   ,  mike   ,  equiment_self_lock   ,  equiment_self_time  ,  deviceType   ,  isKeybox   ,  quipment_exception_id   ,  create_by   ,  create_time   ,  update_by   ,  update_time
     </sql>
     <sql id="insert_columns">
         id
-        ,  device  ,  app_version  ,  wine  ,  cameras  ,  therm  ,  horn  ,  mike  ,  lock  ,  ·time · ,  deviceType  ,  isKeybox  ,  quipment_exception_id  ,  create_by  ,  create_time  ,  update_by  ,  update_time
+        ,  device  ,  app_version  ,  wine  ,  cameras  ,  therm  ,  horn  ,  mike  ,  equiment_self_lock  ,  equiment_self_time ,  deviceType  ,  isKeybox  ,  quipment_exception_id  ,  create_by  ,  create_time  ,  update_by  ,  update_time
     </sql>
     <sql id="insert_values">
@@ -69,8 +69,8 @@
             <if test="null!=therm">therm,</if>
             <if test="null!=horn">horn,</if>
             <if test="null!=mike">mike,</if>
-            <if test="null!=lock">lock,</if>
-            <if test="null!=time">·time·,</if>
+            <if test="null!=lock">equiment_self_lock,</if>
+            <if test="null!=time">equiment_self_time,</if>
             <if test="null!=devicetype">deviceType,</if>
             <if test="null!=iskeybox">isKeybox,</if>
             <if test="null!=quipmentExceptionId">quipment_exception_id,</if>
@@ -113,8 +113,8 @@
             <if test="null!=therm">therm = #{therm,jdbcType=INTEGER},</if>
             <if test="null!=horn">horn = #{horn,jdbcType=INTEGER},</if>
             <if test="null!=mike">mike = #{mike,jdbcType=INTEGER},</if>
-            <if test="null!=lock">lock = #{lock,jdbcType=INTEGER},</if>
-            <if test="null!=time">·time· = #{time,jdbcType=TIMESTAMP},</if>
+            <if test="null!=lock">equiment_self_lock = #{lock,jdbcType=INTEGER},</if>
+            <if test="null!=time">equiment_self_time = #{time,jdbcType=TIMESTAMP},</if>
             <if test="null!=devicetype">deviceType = #{devicetype,jdbcType=VARCHAR},</if>
             <if test="null!=iskeybox">isKeybox = #{iskeybox,jdbcType=BIT},</if>
             <if test="null!=quipmentExceptionId">quipment_exception_id = #{quipmentExceptionId,jdbcType=INTEGER},</if>
@@ -134,8 +134,8 @@
         <if test="null!=therm">AND therm = #{therm,jdbcType=INTEGER},</if>
         <if test="null!=horn">AND horn = #{horn,jdbcType=INTEGER},</if>
         <if test="null!=mike">AND mike = #{mike,jdbcType=INTEGER},</if>
-        <if test="null!=lock">AND lock = #{lock,jdbcType=INTEGER},</if>
-        <if test="null!=time">AND ·time· = #{time,jdbcType=TIMESTAMP},</if>
+        <if test="null!=lock">AND equiment_self_lock = #{lock,jdbcType=INTEGER},</if>
+        <if test="null!=time">AND equiment_self_time = #{time,jdbcType=TIMESTAMP},</if>
         <if test="null!=devicetype">AND deviceType = #{devicetype,jdbcType=VARCHAR},</if>
         <if test="null!=iskeybox">AND isKeybox = #{iskeybox,jdbcType=BIT},</if>
         <if test="null!=quipmentExceptionId">AND quipment_exception_id = #{quipmentExceptionId,jdbcType=INTEGER},</if>
@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="com.ruoyi.domain.sign.in.resource.LinggangSignInResource">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="sign_id" jdbcType="BIGINT" property="signId"/>
-        <result column="index" jdbcType="INTEGER" property="index"/>
+        <result column="sign_in_resource_index" jdbcType="INTEGER" property="index"/>
         <result column="Resource_type" jdbcType="INTEGER" property="resourceType"/>
         <result column="time" jdbcType="TIMESTAMP" property="time"/>
         <result column="create_by" jdbcType="BIGINT" property="createBy"/>
@@ -22,12 +22,12 @@
     <sql id="columns">
         id
-        ,  sign_id   ,  index   ,  Resource_type   ,  time   ,  create_by   ,  create_time   ,  update_by   ,  update_time   ,  path
+        ,  sign_id   ,  sign_in_resource_index   ,  Resource_type   ,  time   ,  create_by   ,  create_time   ,  update_by   ,  update_time   ,  path
     </sql>
     <sql id="insert_columns">
         id
-        ,  sign_id  ,  index  ,  Resource_type  ,  time  ,  create_by  ,  create_time  ,  update_by  ,  update_time  ,  path
+        ,  sign_id  ,  sign_in_resource_index  ,  Resource_type  ,  time  ,  create_by  ,  create_time  ,  update_by  ,  update_time  ,  path
     </sql>
     <sql id="insert_values">
@@ -48,7 +48,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="null!=id">id,</if>
             <if test="null!=signId">sign_id,</if>
-            <if test="null!=index">index,</if>
+            <if test="null!=index">sign_in_resource_index,</if>
             <if test="null!=resourceType">Resource_type,</if>
             <if test="null!=time">time,</if>
             <if test="null!=createBy">create_by,</if>
@@ -78,7 +78,7 @@
         <set>
             <if test="null!=id">id = #{id,jdbcType=BIGINT},</if>
             <if test="null!=signId">sign_id = #{signId,jdbcType=BIGINT},</if>
-            <if test="null!=index">index = #{index,jdbcType=INTEGER},</if>
+            <if test="null!=index">sign_in_resource_index = #{index,jdbcType=INTEGER},</if>
             <if test="null!=resourceType">Resource_type = #{resourceType,jdbcType=INTEGER},</if>
             <if test="null!=time">time = #{time,jdbcType=TIMESTAMP},</if>
             <if test="null!=createBy">create_by = #{createBy,jdbcType=BIGINT},</if>
@@ -92,7 +92,7 @@
     <sql id="where">
         <if test="null!=id">AND id = #{id,jdbcType=BIGINT},</if>
         <if test="null!=signId">AND sign_id = #{signId,jdbcType=BIGINT},</if>
-        <if test="null!=index">AND index = #{index,jdbcType=INTEGER},</if>
+        <if test="null!=index">AND sign_in_resource_index = #{index,jdbcType=INTEGER},</if>
         <if test="null!=resourceType">AND Resource_type = #{resourceType,jdbcType=INTEGER},</if>
         <if test="null!=time">AND time = #{time,jdbcType=TIMESTAMP},</if>
         <if test="null!=createBy">AND create_by = #{createBy,jdbcType=BIGINT},</if>