对接修改

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

@@ -141,7 +141,7 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
             jobTicketPoints.setWorkareaId(dto.getWorkareaId());
             jobTicketPoints.setPointId(isJobTicketPoints.getPointId());
             jobTicketPoints.setPrePointId(isJobTicketPoints.getPrePointId());
-            iIsJobTicketPointsService.save(isJobTicketPoints);
+            iIsJobTicketPointsService.save(jobTicketPoints);
         }
         // 3.1新增作业票和钥匙的关联关系(两条数据，一条上锁，一条解锁)
         saveJobTicketKet(jobTicket.getTicketId());

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

@@ -1,6 +1,7 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
@@ -64,6 +65,12 @@ public class IsKeyServiceImpl extends ServiceImpl<IsKeyMapper, IsKey> implements
     @Override
     public int insertIsKey(IsKey isKey)
     {
+        // 1.检查钥匙名称是否重复
+        List<IsKey> list = list(Wrappers.<IsKey>lambdaQuery().eq(IsKey::getKeyName, isKey.getKeyName()));
+        Assert.isFalse(!list.isEmpty(), "该钥匙名称已被使用!");
+        // 2.检查钥匙编码是否重复
+        List<IsKey> isKeys = list(Wrappers.<IsKey>lambdaQuery().eq(IsKey::getKeyCode, isKey.getKeyCode()));
+        Assert.isFalse(!isKeys.isEmpty(), "该钥匙编码已被使用!");
         isKey.setCreateTime(DateUtils.getNowDate());
         return isKeyMapper.insertIsKey(isKey);
     }
@@ -77,6 +84,16 @@ public class IsKeyServiceImpl extends ServiceImpl<IsKeyMapper, IsKey> implements
     @Override
     public int updateIsKey(IsKey isKey)
     {
+        // 1.检查钥匙名称是否重复
+        List<IsKey> list = list(Wrappers.<IsKey>lambdaQuery()
+                .eq(IsKey::getKeyName, isKey.getKeyName())
+                .ne(IsKey::getKeyId, isKey.getKeyId()));
+        Assert.isFalse(!list.isEmpty(), "该钥匙名称已被使用!");
+        // 2.检查钥匙编码是否重复
+        List<IsKey> isKeys = list(Wrappers.<IsKey>lambdaQuery()
+                .eq(IsKey::getKeyCode, isKey.getKeyCode())
+                .ne(IsKey::getKeyId, isKey.getKeyId()));
+        Assert.isFalse(!isKeys.isEmpty(), "该钥匙编码已被使用!");
         isKey.setUpdateTime(DateUtils.getNowDate());
         return isKeyMapper.updateIsKey(isKey);
     }

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

@@ -1,6 +1,7 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
@@ -71,6 +72,12 @@ public class IsLockServiceImpl extends ServiceImpl<IsLockMapper, IsLock> impleme
     @Override
     public int insertIsLock(IsLock isLock)
     {
+        // 1.检查挂锁名称是否重复
+        List<IsLock> lockList = list(Wrappers.<IsLock>lambdaQuery().eq(IsLock::getLockName, isLock.getLockName()));
+        Assert.isFalse(!lockList.isEmpty(), "该挂锁名称已被使用!");
+        // 2.检查挂锁编码是否重复
+        List<IsLock> locks = list(Wrappers.<IsLock>lambdaQuery().eq(IsLock::getLockCode, isLock.getLockCode()));
+        Assert.isFalse(!locks.isEmpty(), "该挂锁编码已被使用!");
         isLock.setCreateTime(DateUtils.getNowDate());
         return isLockMapper.insertIsLock(isLock);
     }
@@ -84,6 +91,16 @@ public class IsLockServiceImpl extends ServiceImpl<IsLockMapper, IsLock> impleme
     @Override
     public int updateIsLock(IsLock isLock)
     {
+        // 1.检查挂锁名称是否重复
+        List<IsLock> lockList = list(Wrappers.<IsLock>lambdaQuery()
+                .eq(IsLock::getLockName, isLock.getLockName())
+                .ne(IsLock::getLockId, isLock.getLockId()));
+        Assert.isFalse(!lockList.isEmpty(), "该挂锁名称已被使用!");
+        // 2.检查挂锁编码是否重复
+        List<IsLock> locks = list(Wrappers.<IsLock>lambdaQuery()
+                .eq(IsLock::getLockCode, isLock.getLockCode())
+                .ne(IsLock::getLockId, isLock.getLockId()));
+        Assert.isFalse(!locks.isEmpty(), "该挂锁编码已被使用!");
         isLock.setUpdateTime(DateUtils.getNowDate());
         return isLockMapper.updateIsLock(isLock);
     }

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

@@ -64,6 +64,14 @@ public class IsLockTypeServiceImpl extends ServiceImpl<IsLockTypeMapper, IsLockT
     @Override
     public int insertIsLockType(IsLockType isLockType)
     {
+        // 1.检查挂锁类型名称是否重复
+        List<IsLockType> list = list(Wrappers.<IsLockType>lambdaQuery()
+                .eq(IsLockType::getLockTypeName, isLockType.getLockTypeName()));
+        Assert.isFalse(!list.isEmpty(), "该挂锁类型名称已被使用!");
+        // 2.检查挂锁类型编码是否重复
+        List<IsLockType> isLockTypes = list(Wrappers.<IsLockType>lambdaQuery()
+                .eq(IsLockType::getLockTypeCode, isLockType.getLockTypeCode()));
+        Assert.isFalse(!isLockTypes.isEmpty(), "该挂锁类型编码已被使用!");
         isLockType.setCreateTime(DateUtils.getNowDate());
         return isLockTypeMapper.insertIsLockType(isLockType);
     }
@@ -77,6 +85,16 @@ public class IsLockTypeServiceImpl extends ServiceImpl<IsLockTypeMapper, IsLockT
     @Override
     public int updateIsLockType(IsLockType isLockType)
     {
+        // 1.检查挂锁类型名称是否重复
+        List<IsLockType> list = list(Wrappers.<IsLockType>lambdaQuery()
+                .eq(IsLockType::getLockTypeName, isLockType.getLockTypeName())
+                .ne(IsLockType::getLockTypeId, isLockType.getLockTypeId()));
+        Assert.isFalse(!list.isEmpty(), "该挂锁类型名称已被使用!");
+        // 2.检查挂锁类型编码是否重复
+        List<IsLockType> isLockTypes = list(Wrappers.<IsLockType>lambdaQuery()
+                .eq(IsLockType::getLockTypeCode, isLockType.getLockTypeCode())
+                .ne(IsLockType::getLockTypeId, isLockType.getLockTypeId()));
+        Assert.isFalse(!isLockTypes.isEmpty(), "该挂锁类型编码已被使用!");
         isLockType.setUpdateTime(DateUtils.getNowDate());
         return isLockTypeMapper.updateIsLockType(isLockType);
     }

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

@@ -1,6 +1,7 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
@@ -59,6 +60,14 @@ public class IsLocksetServiceImpl extends ServiceImpl<IsLocksetMapper, IsLockset
     @Override
     public int insertIsLockset(IsLockset isLockset)
     {
+        // 1.检查挂锁名称是否重复
+        List<IsLockset> list = list(Wrappers.<IsLockset>lambdaQuery()
+                .eq(IsLockset::getLocksetName, isLockset.getLocksetName()));
+        Assert.isFalse(!list.isEmpty(), "该锁具名称已被使用!");
+        // 2.检查挂锁编码是否重复
+        List<IsLockset> locksets = list(Wrappers.<IsLockset>lambdaQuery()
+                .eq(IsLockset::getLocksetCode, isLockset.getLocksetCode()));
+        Assert.isFalse(!locksets.isEmpty(), "该锁具编码已被使用!");
         isLockset.setCreateTime(DateUtils.getNowDate());
         return isLocksetMapper.insertIsLockset(isLockset);
     }
@@ -72,6 +81,16 @@ public class IsLocksetServiceImpl extends ServiceImpl<IsLocksetMapper, IsLockset
     @Override
     public int updateIsLockset(IsLockset isLockset)
     {
+        // 1.检查挂锁名称是否重复
+        List<IsLockset> list = list(Wrappers.<IsLockset>lambdaQuery()
+                .eq(IsLockset::getLocksetName, isLockset.getLocksetName())
+                .ne(IsLockset::getLocksetId, isLockset.getLocksetId()));
+        Assert.isFalse(!list.isEmpty(), "该锁具名称已被使用!");
+        // 2.检查挂锁编码是否重复
+        List<IsLockset> locksets = list(Wrappers.<IsLockset>lambdaQuery()
+                .eq(IsLockset::getLocksetCode, isLockset.getLocksetCode())
+                .ne(IsLockset::getLocksetId, isLockset.getLocksetId()));
+        Assert.isFalse(!locksets.isEmpty(), "该锁具编码已被使用!");
         isLockset.setUpdateTime(DateUtils.getNowDate());
         return isLocksetMapper.updateIsLockset(isLockset);
     }

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

@@ -1,6 +1,7 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
@@ -59,6 +60,14 @@ public class IsLocksetTypeServiceImpl extends ServiceImpl<IsLocksetTypeMapper, I
     @Override
     public int insertIsLocksetType(IsLocksetType isLocksetType)
     {
+        // 1.检查锁具类型名称是否重复
+        List<IsLocksetType> list = list(Wrappers.<IsLocksetType>lambdaQuery()
+                .eq(IsLocksetType::getLocksetTypeName, isLocksetType.getLocksetTypeName()));
+        Assert.isFalse(!list.isEmpty(), "该锁具类型名称已被使用!");
+        // 2.检查锁具类型编码是否重复
+        List<IsLocksetType> isLocksetTypes = list(Wrappers.<IsLocksetType>lambdaQuery()
+                .eq(IsLocksetType::getLocksetTypeCode, isLocksetType.getLocksetTypeCode()));
+        Assert.isFalse(!isLocksetTypes.isEmpty(), "该锁具类型编码已被使用!");
         isLocksetType.setCreateTime(DateUtils.getNowDate());
         return isLocksetTypeMapper.insertIsLocksetType(isLocksetType);
     }
@@ -72,6 +81,16 @@ public class IsLocksetTypeServiceImpl extends ServiceImpl<IsLocksetTypeMapper, I
     @Override
     public int updateIsLocksetType(IsLocksetType isLocksetType)
     {
+        // 1.检查锁具类型名称是否重复
+        List<IsLocksetType> list = list(Wrappers.<IsLocksetType>lambdaQuery()
+                .eq(IsLocksetType::getLocksetTypeName, isLocksetType.getLocksetTypeName())
+                .ne(IsLocksetType::getLocksetTypeId, isLocksetType.getLocksetTypeId()));
+        Assert.isFalse(!list.isEmpty(), "该锁具类型名称已被使用!");
+        // 2.检查锁具类型编码是否重复
+        List<IsLocksetType> isLocksetTypes = list(Wrappers.<IsLocksetType>lambdaQuery()
+                .eq(IsLocksetType::getLocksetTypeCode, isLocksetType.getLocksetTypeCode())
+                .ne(IsLocksetType::getLocksetTypeId, isLocksetType.getLocksetTypeId()));
+        Assert.isFalse(!isLocksetTypes.isEmpty(), "该锁具类型编码已被使用!");
         isLocksetType.setUpdateTime(DateUtils.getNowDate());
         return isLocksetTypeMapper.updateIsLocksetType(isLocksetType);
     }

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

@@ -73,6 +73,10 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
     @Override
     public int insertIsMaterialsType(MaterialsTypePageDTO dto)
     {
+        // 2.检查物资类型编码是否重复
+        List<IsMaterialsType> list = list(Wrappers.<IsMaterialsType>lambdaQuery()
+                .eq(IsMaterialsType::getMaterialsTypeCode, dto.getMaterialsTypeCode()));
+        Assert.isFalse(!list.isEmpty(), "该物资类型编码已被使用!");
         Assert.isTrue(dto.getLoanDuration() >= dto.getReminderTime(), "借用时长需要大于等于提醒时长！");
         dto.setCreateTime(DateUtils.getNowDate());
         IsMaterialsType isMaterialsType = BeanUtils.toBean(dto, IsMaterialsType.class);
@@ -100,6 +104,11 @@ public class IsMaterialsTypeServiceImpl extends ServiceImpl<IsMaterialsTypeMappe
     @Override
     public int updateIsMaterialsType(MaterialsTypePageDTO dto)
     {
+        // 2.检查物资类型编码是否重复
+        List<IsMaterialsType> list = list(Wrappers.<IsMaterialsType>lambdaQuery()
+                .eq(IsMaterialsType::getMaterialsTypeCode, dto.getMaterialsTypeCode())
+                .ne(IsMaterialsType::getMaterialsTypeId, dto.getMaterialsTypeId()));
+        Assert.isFalse(!list.isEmpty(), "该物资类型编码已被使用!");
         Assert.isTrue(dto.getLoanDuration() >= dto.getReminderTime(), "借用时长需要大于等于提醒时长！");
         dto.setUpdateTime(DateUtils.getNowDate());
         IsMaterialsType isMaterialsType = BeanUtils.toBean(dto, IsMaterialsType.class);

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

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ORDER BY
-        l.lock_type_id DESC
+        l.lock_type_id asc
     </select>
 
 

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

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ORDER BY
-        l.lockset_type_id DESC
+        l.lockset_type_id asc
     </select>
 
 </mapper>

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

@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and t.status like concat('%',#{isMaterialsType.status},'%')
             </if>
         </where>
-            order by t.materials_type_id desc
+            order by t.materials_type_id asc
     </select>
     <select id="selectIsMaterialsTypeByMaterialsTypeId"
             resultType="com.ktg.iscs.domain.vo.materialsType.MaterialsTypePageVO">