Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-web/src/main/java/com/clx/performance/dao/impl/linewarn/LineWarnRangeDaoImpl.java

@@ -2,8 +2,8 @@ package com.clx.performance.dao.impl.linewarn;
 
 import com.clx.performance.dao.linewarn.LineWarnRangeDao;
 import com.clx.performance.enums.linewarn.LineWarnRangEnum;
-import com.clx.performance.mapper.linewarn.LineWarnRangMapper;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.mapper.linewarn.LineWarnRangeMapper;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
@@ -11,24 +11,24 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public class LineWarnRangeDaoImpl extends BaseDaoImpl<LineWarnRangMapper, LineWarnRang, Integer> implements LineWarnRangeDao {
+public class LineWarnRangeDaoImpl extends BaseDaoImpl<LineWarnRangeMapper, LineWarnRange, Integer> implements LineWarnRangeDao {
 
 
     @Override
-    public List<LineWarnRang> ListByWarnConfigId(Integer warnConfigId) {
+    public List<LineWarnRange> ListByWarnConfigId(Integer warnConfigId) {
         return list(lQrWrapper()
-                        .eq(LineWarnRang::getWarnConfigId, warnConfigId)
-                        .eq(LineWarnRang::getStatus, LineWarnRangEnum.Status.ENABLE.getCode())
-                        .orderByDesc(LineWarnRang::getId)
+                        .eq(LineWarnRange::getWarnConfigId, warnConfigId)
+                        .eq(LineWarnRange::getStatus, LineWarnRangEnum.Status.ENABLE.getCode())
+                        .orderByDesc(LineWarnRange::getId)
                 );
     }
 
     @Override
-    public boolean updateDisable(LineWarnRang item) {
+    public boolean updateDisable(LineWarnRange item) {
         return update(lUdWrapper()
-                .eq(LineWarnRang::getWarnConfigId, item.getWarnConfigId())
-                .eq(StringUtils.isNotBlank(item.getOrderGoodsNo()), LineWarnRang::getOrderGoodsNo, item.getOrderGoodsNo())
-                .set(LineWarnRang::getStatus, LineWarnRangEnum.Status.DISABLE.getCode())
+                .eq(LineWarnRange::getWarnConfigId, item.getWarnConfigId())
+                .eq(StringUtils.isNotBlank(item.getOrderGoodsNo()), LineWarnRange::getOrderGoodsNo, item.getOrderGoodsNo())
+                .set(LineWarnRange::getStatus, LineWarnRangEnum.Status.DISABLE.getCode())
         );
     }
 }

performance-web/src/main/java/com/clx/performance/dao/linewarn/LineWarnRangeDao.java

 package com.clx.performance.dao.linewarn;
 
-import com.clx.performance.mapper.linewarn.LineWarnRangMapper;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.mapper.linewarn.LineWarnRangeMapper;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;
 
-public interface LineWarnRangeDao extends BaseDao<LineWarnRangMapper, LineWarnRang, Integer> {
-    List<LineWarnRang> ListByWarnConfigId(Integer warnConfigId);
+public interface LineWarnRangeDao extends BaseDao<LineWarnRangeMapper, LineWarnRange, Integer> {
+    List<LineWarnRange> ListByWarnConfigId(Integer warnConfigId);
 
-    boolean updateDisable(LineWarnRang item);
+    boolean updateDisable(LineWarnRange item);
 }

performance-web/src/main/java/com/clx/performance/mapper/linewarn/LineWarnRangMapper.java → performance-web/src/main/java/com/clx/performance/mapper/linewarn/LineWarnRangeMapper.java

 package com.clx.performance.mapper.linewarn;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface LineWarnRangMapper extends BaseMapper<LineWarnRang> {
+public interface LineWarnRangeMapper extends BaseMapper<LineWarnRange> {
 
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/linewarn/LineWarnRang.java → performance-web/src/main/java/com/clx/performance/model/linewarn/LineWarnRange.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 @Setter
 @NoArgsConstructor
 @TableName(autoResultMap = true)
-public class LineWarnRang implements HasKey<Integer> {
+public class LineWarnRange implements HasKey<Integer> {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;                             //id

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnInfoServiceImpl.java

@@ -13,7 +13,7 @@ import com.clx.performance.enums.linewarn.LineWarnLogEnum;
 import com.clx.performance.enums.linewarn.LineWarnRangEnum;
 import com.clx.performance.model.linewarn.LineWarnInfo;
 import com.clx.performance.model.linewarn.LineWarnLog;
-import com.clx.performance.model.linewarn.LineWarnRang;
+import com.clx.performance.model.linewarn.LineWarnRange;
 import com.clx.performance.param.pc.linewarn.LineWarnInfoResolveUpdateParam;
 import com.clx.performance.param.pc.linewarn.LineWarnInfoSuspendUpdateParam;
 import com.clx.performance.param.pc.linewarn.PageLineWarnInfoParam;
@@ -72,18 +72,18 @@ public class LineWarnInfoServiceImpl implements LineWarnInfoService {
         lineWarnLog.setCreateBy(loginUserInfo.getUserName());
         lineWarnLogDao.saveEntity(lineWarnLog);
 
-        LineWarnRang lineWarnRang = new LineWarnRang();
-        lineWarnRang.setWarnConfigId(lineWarnInfo.getWarnConfigId());
-        lineWarnRang.setWarnName(lineWarnInfo.getWarnName());
-        lineWarnRang.setOrderGoodsNo(lineWarnInfo.getOrderGoodsNo());
-        lineWarnRang.setWarnEndTime(endTime);
-        lineWarnRang.setStatus(LineWarnRangEnum.Status.ENABLE.getCode());
-        lineWarnRang.setCreateBy(loginUserInfo.getUserName());
+        LineWarnRange lineWarnRange = new LineWarnRange();
+        lineWarnRange.setWarnConfigId(lineWarnInfo.getWarnConfigId());
+        lineWarnRange.setWarnName(lineWarnInfo.getWarnName());
+        lineWarnRange.setOrderGoodsNo(lineWarnInfo.getOrderGoodsNo());
+        lineWarnRange.setWarnEndTime(endTime);
+        lineWarnRange.setStatus(LineWarnRangEnum.Status.ENABLE.getCode());
+        lineWarnRange.setCreateBy(loginUserInfo.getUserName());
 
         // 禁用旧数据
-        lineWarnRangeDao.updateDisable(lineWarnRang);
+        lineWarnRangeDao.updateDisable(lineWarnRange);
         // 新增新数据
-        lineWarnRangeDao.saveEntity(lineWarnRang);
+        lineWarnRangeDao.saveEntity(lineWarnRange);
     }
 
     @Transactional(rollbackFor = Exception.class)