Merge remote-tracking branch 'origin/master'

lms/nladmin-system/nlsso-server/pom.xml

@@ -360,7 +360,13 @@
         <dependency>
             <groupId>com.alicp.jetcache</groupId>
             <artifactId>jetcache-starter-redis</artifactId>
-            <version>2.5.14</version>
+            <version>2.7.3</version>
+        </dependency>
+        <!--        jetcache2.7.x版本需要额外添加该依赖-->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.3.1</version>
         </dependency>
 
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java

@@ -1,19 +1,36 @@
 package org.nl.common.utils;
 
+import lombok.SneakyThrows;
+import org.nl.common.exception.BadRequestException;
 import org.nl.config.SpringContextHolder;
 import org.nl.system.service.coderule.ISysCodeRuleService;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public class CodeUtil {
 
+    @SneakyThrows
     public static String getNewCode(String ruleCode){
-        synchronized (ruleCode){
+        RedissonClient redissonClient = SpringContextHolder.getBean(RedissonClient.class);
-            String flag = "1";
+        RLock lock = redissonClient.getLock(ruleCode);
-            HashMap<String,String> map = new HashMap<>();
+        boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS);
-            map.put("flag",flag);
+        try {
-            map.put("code",ruleCode);
+            if (tryLock) {
-            return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map);
+                String flag = "1";
+                HashMap<String,String> map = new HashMap<>();
+                map.put("flag",flag);
+                map.put("code",ruleCode);
+                return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map);
+            } else {
+                throw new BadRequestException("系统繁忙，稍后在试");
+            }
+        } finally {
+            if (tryLock) {
+                lock.unlock();
+            }
         }
     }
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java

@@ -41,6 +41,6 @@ public class LogMessageConstant {
     /** 背景颜色：黄色 */
     public final static String BACKGROUND_YELLOW = "\u001B[43m";
     /** 索引路径 */
-    public final static String INDEX_DIR = "E:\\lucene\\index";
+    public final static String INDEX_DIR = "D:\\lucene\\index";
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java

@@ -57,12 +57,15 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
     }
 
     @Override
+    @Transactional(propagation=Propagation.REQUIRES_NEW)
     public String codeDemo(Map form) {
         String code = (String) form.get("code");
         String id = codeRuleMapper.selectOne(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, code)).getId();
         // 如果flag = 1就执行更新数据库的操作
         String flag = (String) form.get("flag");
-        List<SysCodeRuleDetail> ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper<SysCodeRuleDetail>().eq(SysCodeRuleDetail::getCode_rule_id, id));
+        List<SysCodeRuleDetail> ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper<SysCodeRuleDetail>()
+                .eq(SysCodeRuleDetail::getCode_rule_id, id)
+                .orderByAsc(SysCodeRuleDetail::getSort_num));
         String demo = "";
         boolean isSame = true;
         for(SysCodeRuleDetail detail : ruleDetails) {
@@ -92,7 +95,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
                 String numValue = "";
                 int step = Integer.parseInt(detail.getStep());
                 Long maxValue = Long.valueOf(detail.getMax_value());
-                if (!isSame && (Long.valueOf(detail.getCurrent_value()) + step) > maxValue) {
+                if (!isSame || (Long.valueOf(detail.getCurrent_value()) + step) > maxValue) {
                     numValue = detail.getInit_value();
                 } else {
                     numValue = Integer.parseInt(detail.getCurrent_value()) + step + "";

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java

@@ -1,5 +1,7 @@
 package org.nl.system.service.param;
 
+import com.alicp.jetcache.anno.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
@@ -25,7 +27,8 @@ public interface ISysParamService extends IService<Param> {
      * @param page      分页信息
      * @return
      */
-    Page<Param> queryPage(Map whereJson, PageQuery page);
+    IPage<Param> queryPage(Map whereJson, PageQuery page);
+
 
     /**
      * 创建参数
@@ -39,6 +42,7 @@ public interface ISysParamService extends IService<Param> {
      *
      * @param param
      */
+    @CacheUpdate(name = "paramDataCode.", key = "#param.code", value = "#param")
     void update(Param param);
 
     /**
@@ -51,8 +55,9 @@ public interface ISysParamService extends IService<Param> {
     /**
      * 根据编码查询
      *
-     * @param code code
+     * @param code
      * @return Param
      */
+    @Cached(name = "paramDataCode.", key = "#code", expire = 3600, cacheType = CacheType.REMOTE)
     Param findByCode(String code);
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -37,12 +38,14 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
     @Autowired
     private SysParamMapper paramMapper;
 
+
     @Override
-    public Page<Param> queryPage(Map whereJson, PageQuery page) {
+    public IPage<Param> queryPage(Map whereJson, PageQuery page) {
-        QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Param> queryWrapper = new QueryWrapper<Param>().lambda();
-        queryWrapper.orderBy(true, true, "create_time");
+        queryWrapper.orderByAsc(Param::getCreate_time);
-        Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper);
+        IPage<Param> pages = new Page<>(page.getPage() + 1, page.getSize());
-        return paramPage;
+        paramMapper.selectPage(pages, queryWrapper);
+        return pages;
     }
 
     @Override

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java

@@ -1,7 +1,6 @@
 package org.nl.wms.ext.mes.service.dto;
 
 import cn.hutool.http.HttpStatus;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.Data;
 
 /**

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java

@@ -4,16 +4,11 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sun.org.apache.regexp.internal.RE;
 import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.CodeUtil;
-import org.nl.config.MapOf;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
-import org.nl.wms.ext.acs.service.dto.to.wms.ApplyDeviceDto;
 import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
 import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
@@ -30,7 +25,6 @@ import org.nl.wms.sch.task_manage.enums.*;
 import org.nl.wms.sch.task_manage.task.TaskType;
 import org.nl.wms.sch.task_manage.task.core.TaskStatus;
 import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.nl.wms.util.CommonUtils;
 import org.nl.wms.util.PointUtils;
 import org.nl.wms.util.TaskUtils;
 import org.springframework.beans.factory.annotation.Autowired;