diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 7537460..7662a87 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; /** * 开启审计功能 -> @EnableJpaAuditing * https://www.cnblogs.com/niceyoo/p/10908647.html + * '@ServletComponentScan https://blog.csdn.net/qq_36850813/article/details/101194250 * * @author ldjun * @date 2021/2/22 9:20:19 @@ -31,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController; @SpringBootApplication(exclude = { org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) -@ServletComponentScan //https://blog.csdn.net/qq_36850813/article/details/101194250 +@ServletComponentScan @EnableTransactionManagement @EnableMethodCache(basePackages = "org.nl") @EnableCreateCacheAnnotation diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java index 71ccd84..0d7a3e7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java @@ -7,13 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache; import lombok.Data; import org.nl.common.enums.QueryTEnum; import org.nl.config.MapOf; +import org.nl.wms.sch.task_manage.enums.FieldConstant; import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; import java.lang.reflect.Type; import java.util.Date; import java.util.Map; -/* +/** * @author ZZQ * @Date 2022/12/14 6:33 下午 * 泛型必须为数据tb对应do:由mybatis管理 @@ -37,31 +38,32 @@ public class BaseQuery { /** * 字段映射Map:指定字段对应QueryWrapper的查询类型 - * 字段与数据库字段对应，不支持驼峰 - * @see org.nl.common.enums.QueryTEnum + * 字段与数据库字段对应，不支持驼峰 + * + * @see org.nl.common.enums.QueryTEnum * 通过buid构建 */ public Map doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build() - ,"startTime", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build() - ,"endTime", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build() - ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build() + , "startTime", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build() + , "endTime", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build() + , "sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build() ); - public QueryWrapper build(){ + public QueryWrapper build() { this.paramMapping(); QueryWrapper wrapper = new QueryWrapper<>(); - JSONObject json = (JSONObject)JSONObject.toJSON(this); + JSONObject json = (JSONObject) JSONObject.toJSON(this); Type[] types = ((ParameterizedTypeImpl) this.getClass().getGenericSuperclass()).getActualTypeArguments(); Map columnMap = LambdaUtils.getColumnMap((Class) types[0]); json.forEach((key, vel) -> { - if (vel != null && !key.equals("doP")){ + if (vel != null && !(FieldConstant.DOP).equals(key)) { QParam qParam = doP.get(key); - if (qParam != null){ - QueryTEnum.build(qParam.type,wrapper,qParam.k,vel); - }else { + if (qParam != null) { + QueryTEnum.build(qParam.type, wrapper, qParam.k, vel); + } else { ColumnCache columnCache = columnMap.get(LambdaUtils.formatKey(key)); - if (columnCache!=null){ - wrapper.eq(columnCache.getColumn(),vel); + if (columnCache != null) { + wrapper.eq(columnCache.getColumn(), vel); } } } @@ -69,5 +71,8 @@ public class BaseQuery { return wrapper; } - public void paramMapping(){}; + public void paramMapping() { + } + + ; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java index 94e775c..4ba340a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java @@ -2,13 +2,13 @@ package org.nl.common.domain.query; import java.util.Objects; -/* +/** * @author ZZQ * @Date 2022/12/14 8:40 下午 */ @FunctionalInterface -public interface LConsumer { +public interface LConsumer { - void accept(X x,Y y,Z z); + void accept(X x, Y y, Z z); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java index e268c0b..0c233b0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java @@ -13,7 +13,9 @@ import java.util.Locale; /** - * 分页参数 + * @Author: lyd + * @Description: 分页参数 + * @Date: 2023/8/14 */ @Data public class PageQuery implements Serializable { @@ -57,37 +59,37 @@ public class PageQuery implements Serializable { pageNum = DEFAULT_PAGE_NUM; } Page page = new Page<>(pageNum, pageSize); - if (StringUtils.isNotEmpty(sort)){ + if (StringUtils.isNotEmpty(sort)) { String[] split = sort.split(","); - for (int i = 0; i < (split.length & ~1); i=i+2) { + for (int i = 0; i < (split.length & ~1); i = i + 2) { String col = split[i]; OrderItem item = new OrderItem(); item.setColumn(col); - item.setAsc(split[i+1].toLowerCase(Locale.ROOT).equals("asc")); + item.setAsc("asc".equals(split[i + 1].toLowerCase(Locale.ROOT))); page.addOrder(item); } } return page; } - public Page build(Class r) { + public Page build(Class r) { Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM); Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE); if (pageNum <= 0) { pageNum = DEFAULT_PAGE_NUM; } Page page = new Page<>(pageNum, pageSize); - if (StringUtils.isNotEmpty(sort)){ + if (StringUtils.isNotEmpty(sort)) { String[] split = sort.split(","); - for (int i = 0; i < (split.length & ~1); i=i+2) { + for (int i = 0; i < (split.length & ~1); i = i + 2) { String col = split[i]; - if ("id".equals(col)){ + if ("id".equals(col)) { String mId = mappingId(r); - col = StringUtils.isNotEmpty(mId)?mId:col; + col = StringUtils.isNotEmpty(mId) ? mId : col; } OrderItem item = new OrderItem(); item.setColumn(col); - item.setAsc(split[i+1].toLowerCase(Locale.ROOT).equals("asc")); + item.setAsc("asc".equals(split[i + 1].toLowerCase(Locale.ROOT))); page.addOrder(item); } @@ -95,12 +97,12 @@ public class PageQuery implements Serializable { return page; } - private String mappingId(R r){ - if (r instanceof Class){ + private String mappingId(R r) { + if (r instanceof Class) { Field[] fields = ((Class) r).getDeclaredFields(); for (Field field : fields) { TableId[] byType = field.getAnnotationsByType(TableId.class); - if (byType !=null && byType.length>0){ + if (byType != null && byType.length > 0) { TableId tableId = byType[0]; return tableId.value(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java index 112429a..1035bb0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java @@ -1,7 +1,18 @@ package org.nl.common.enums; +/** + * @Author: lyd + * @Description: 日志类型枚举 + * @Date: 2023/8/14 + */ public enum LogTypeEnum { + /** + * 设备日志 + */ DEVICE_LOG("设备日志"), + /** + * 接口日志 + */ INTERFACE_LOG("接口日志"); private String desc; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java index 4e6be7b..962d4b6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java @@ -11,10 +11,25 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum NoticeEnum { + /** + * 未读 + */ HAVE_READ_OFF("1","未读"), + /** + * 已读 + */ HAVE_READ_ON("2", "已读"), + /** + * 未处理 + */ DEAL_STATUS_NO("1", "未处理"), + /** + * 已处理 + */ DEAL_STATUS_YES("2", "已处理"), + /** + * 无需处理 + */ DEAL_STATUS_NO_NEED("3", "无需处理"); private final String value; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java index 2cdc02f..6ccf978 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java @@ -11,8 +11,17 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum PointStatusEnum { + /** + * 空位 + */ EMPTY_PLACE("1", "空位"), + /** + * 有料 + */ FULL_MATERIAL("2", "有料"), + /** + * 空载具 + */ EMPTY_VEHICLE("3", "空载具"); private final String value; private final String description; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java index 230b1af..5c36e8a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java @@ -76,7 +76,6 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(value = NotLoginException.class) public ResponseEntity notLoginException(Exception e) { -// log.error(ThrowableUtil.getStackTrace(e)); return buildResponseEntity(ApiError.error(401,"token 失效")); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java index 4308e09..2f9189b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java @@ -10,6 +10,11 @@ import org.redisson.api.RedissonClient; import java.util.HashMap; import java.util.concurrent.TimeUnit; +/** + * @Author: lyd + * @Description: 代码生成工具 + * @Date: 2023/8/14 + */ public class CodeUtil { @SneakyThrows diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java index 69f3153..8615a3c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -/* +/** * @author ZZQ * @Date 2022/12/1 3:35 下午 */ @@ -19,7 +19,7 @@ public class CopyUtil { List list = new ArrayList(sources.size()); Iterator var3 = sources.iterator(); - while(var3.hasNext()) { + while (var3.hasNext()) { Object source = var3.next(); try { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java index 35f7c49..4e332ce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java @@ -105,8 +105,9 @@ public class DesUtil { * @throws Exception */ public static String decrypt(String data, String key) throws Exception { - if (data == null) + if (data == null) { return null; + } BASE64Decoder decoder = new BASE64Decoder(); byte[] buf = decoder.decodeBuffer(data); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java index b434369..83b707a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java @@ -61,16 +61,6 @@ public class SecurityUtils { return getCurrentUser().getId(); } - /** - * 获取系统用户Id - * - * @return 系统用户Id - */ - public static Long getDeptId() { -// return getCurrentUser().getUser().getDept().getId(); - return 1L; - } - /** * 获取当前用户权限 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java index 440752f..ee2178f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java @@ -19,13 +19,22 @@ public class CurrentUser implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private String id; - //账号 + /** + * 账号 + */ private String username; - //姓名 + /** + * 姓名 + */ private String presonName; - //用户详细信息 + /** + * 用户详细信息 + */ private SysUser user; + /** + * 权限列表 + */ private List permissions = new ArrayList<>(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java index 7ecd4bf..5a69104 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java @@ -8,16 +8,16 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Iterator; -/* +/** * @author ZZQ * @Date 2022/11/29 2:55 下午 */ public class MapOf implements Serializable { - public static HashMap of(K... key){ + public static HashMap of(K... key) { HashMap map = new HashMap<>(); - for (int i = 0; i < (key.length & ~1); i=i+2) { - map.put(key[i],key[i+1]); + for (int i = 0; i < (key.length & ~1); i = i + 2) { + map.put(key[i], key[i + 1]); } return map; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java index 000ca5e..aa920a5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java @@ -36,7 +36,8 @@ public class DynamicLogAppender { //设置日志记录器的滚动策略 TimeBasedRollingPolicy policy = new TimeBasedRollingPolicy(); policy.setFileNamePattern(oldLogPath+dynamicName+".%d{yyyy-MM-dd}.log"); - policy.setParent(appender); //设置父节点是appender + //设置父节点是appender + policy.setParent(appender); policy.setContext(context); policy.start(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java index 566a899..2881728 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java @@ -9,7 +9,8 @@ import java.util.HashMap; import java.util.Map; public class DynamicLogger { - String logPath;//日志存储路径 + //日志存储路径 + String logPath; public DynamicLogger(String logPath) { this.logPath = logPath; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java index 14ddcca..c2fc8e5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java +++ b/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"; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java index 086f4e1..5981e34 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java @@ -40,8 +40,6 @@ public class Searcher { //标准分词器，会自动去掉空格啊，is a the等单词 Analyzer analyzer = new IKAnalyzer(true); - //记录索引开始时间 -// long startTime = System.currentTimeMillis(); // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数： int pageSize = Integer.parseInt(whereJson.get("size").toString());// 每页条数 int pageNum = Integer.parseInt(whereJson.get("page").toString()) - 1;// 当前页码 @@ -90,13 +88,11 @@ public class Searcher { booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } docs = searcher.search(booleanQueryBuilder.build(), end,sort); - //记录索引时间 -// long endTime = System.currentTimeMillis(); -// log.info("匹配{}共耗时{}毫秒",booleanQueryBuilder.build(),(endTime-startTime)); -// log.info("查询到{}条日志文件", docs.totalHits.value); List list = new ArrayList<>(); ScoreDoc[] scoreDocs = docs.scoreDocs; - if (end > docs.totalHits.value) end = (int) docs.totalHits.value; + if (end > docs.totalHits.value) { + end = (int) docs.totalHits.value; + } for (int i = start; i < end; i++) { ScoreDoc scoreDoc = scoreDocs[i]; @@ -112,7 +108,6 @@ public class Searcher { LogMessageConstant.COLOR_MAGENTA + doc.get(LogMessageConstant.FIELD_CLASS_NAME) + LogMessageConstant.COLOR_RESET + " - " + LogMessageConstant.COLOR_BLACK + highlightKeyword(doc.get(LogMessageConstant.FIELD_MESSAGE), whereJson.getString("message")); -// System.out.println(logInfo); list.add(logInfo); } reader.close(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java index dd7ce01..7738e40 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java @@ -1,5 +1,10 @@ package org.nl.config.lucene; +/** + * @Author: lyd + * @Description: 路径配置类 + * @Date: 2023/8/14 + */ public class UrlConfig { public static String luceneUrl; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 2e59dc3..f0d310a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -3,15 +3,20 @@ package org.nl.config.mybatis; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.InjectionConfig; -import com.baomidou.mybatisplus.generator.config.*; -import com.baomidou.mybatisplus.generator.config.po.TableInfo; +import com.baomidou.mybatisplus.generator.config.DataSourceConfig; +import com.baomidou.mybatisplus.generator.config.GlobalConfig; +import com.baomidou.mybatisplus.generator.config.PackageConfig; +import com.baomidou.mybatisplus.generator.config.StrategyConfig; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.List; import java.util.Scanner; +/** + * @Author: lyd + * @Description: 代码生成 + * @Date: 2023/8/14 + */ public class CodeGenerator { /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index 6b57662..e17db63 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -8,6 +8,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; +/** + * @Author: lyd + * @Description: Mybatis-plus配置 + * @Date: 2023/8/14 + */ @EnableTransactionManagement @Configuration public class MybatisPlusConfig { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java index 58a43cb..8b9651a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java @@ -14,6 +14,11 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; +/** + * @Author: lyd + * @Description: 日志检索 + * @Date: 2023/8/14 + */ @RestController @RequiredArgsConstructor @Api(tags = "日志检索") @@ -24,8 +29,6 @@ public class LuceneController { private final LuceneService luceneService; @PostMapping("/getAll") - @ApiOperation("日志检索") - //@PreAuthorize("@el.check('task:list')") public ResponseEntity get(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(luceneService.getAll(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index 183a9f2..9deb8ad 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -18,6 +18,7 @@ import org.nl.common.security.config.bean.LoginProperties; import org.nl.system.service.secutiry.impl.OnlineUserService; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; +import org.nl.wms.sch.task_manage.GeneralDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -85,8 +86,8 @@ public class AuthorizationController { String uuid = IdUtil.simpleUUID(); //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 String captchaValue = captcha.text(); - if (captcha.getCharType() - 1 == LoginCodeEnum.arithmetic.ordinal() && captchaValue.contains(".")) { - captchaValue = captchaValue.split("\\.")[0]; + if (captcha.getCharType() - 1 == LoginCodeEnum.arithmetic.ordinal() && captchaValue.contains(GeneralDefinition.DOT)) { + captchaValue = captchaValue.split(GeneralDefinition.ESCAPE_DOT)[0]; } // 保存 redisUtils.set(uuid, captchaValue, loginProperties.getLoginCode().getExpiration(), TimeUnit.MINUTES); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index 2cc9952..baf7c1e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -19,6 +19,7 @@ import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.secutiry.dto.AuthUserDto; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; +import org.nl.wms.sch.task_manage.GeneralDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -52,9 +53,11 @@ public class MobileAuthorizationController { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); // 校验数据库 // 根据用户名查询，在比对密码 + // 拿到多个已经抛出异常 SysUser userInfo = userService.getOne(new LambdaQueryWrapper() - .eq(SysUser::getUsername, authUser.getUsername())); // 拿到多个已经抛出异常 - if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 + .eq(SysUser::getUsername, authUser.getUsername())); + // 这里需要密码加密 + if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))) { throw new BadRequestException("账号或密码错误！"); } // 获取权限列表 - 登录查找权限 @@ -74,13 +77,14 @@ public class MobileAuthorizationController { // SaLoginModel 配置登录相关参数 StpUtil.login(userInfo.getUser_id(), new SaLoginModel() - .setDevice("PE") // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 - .setExtra("loginInfo", user) // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） + // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 + .setDevice("PE") + // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） + .setExtra("loginInfo", user) ); // 返回 token 与 用户信息 JSONObject jsonObject = new JSONObject(); -// jsonObject.put("roles", permissionList); jsonObject.put("user", userInfo); JSONObject authInfo = new JSONObject(2) {{ put("token", "Bearer " + StpUtil.getTokenValue()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index c9204a5..d558ace 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -34,6 +34,7 @@ import org.nl.common.logging.annotation.Log; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dto.UserQuery; +import org.nl.wms.sch.task_manage.GeneralDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -108,13 +109,13 @@ public class UserController { String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("oldPass")); String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass")); SysUser user = userService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, SecurityUtils.getCurrentUsername())); - if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) { + if (!SaSecureUtil.md5BySalt(user.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(oldPass, GeneralDefinition.SALT))) { throw new BadRequestException("修改失败，旧密码错误"); } - if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) { + if (!SaSecureUtil.md5BySalt(user.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(newPass, GeneralDefinition.SALT))) { throw new BadRequestException("新密码不能与旧密码相同"); } - user.setPassword(SaSecureUtil.md5BySalt(newPass, "salt")); + user.setPassword(SaSecureUtil.md5BySalt(newPass, GeneralDefinition.SALT)); userService.updateById(user); return new ResponseEntity<>(HttpStatus.OK); } @@ -131,16 +132,11 @@ public class UserController { public ResponseEntity updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); SysUser userInfo = userService.getOne(new QueryWrapper().eq("username",SecurityUtils.getCurrentUsername())); - if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(password, "salt"))){ + if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))){ throw new BadRequestException("密码错误"); } userService.update(new UpdateWrapper().set(userInfo.getUsername(),user.getEmail())); return new ResponseEntity<>(HttpStatus.OK); } - /** - * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误 - * @param resources / - */ - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java index f595798..597669d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java @@ -19,8 +19,18 @@ import java.util.Map; */ public interface ISysCodeRuleDetailService extends IService { + /** + * 分页查询 + * @param form + * @param pageable + * @return + */ IPage queryAll(CodeRuleDetailQuery form, PageQuery pageable); + /** + * 创建 + * @param codeRuleDetail + */ void create(SysCodeRuleDetail codeRuleDetail); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java index c8fa95b..962d9a4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java @@ -61,7 +61,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl().eq(SysCodeRule::getCode, code)).getId(); @@ -88,7 +88,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode())); - if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("编号[" + sysCodeRules.get(0).getCode() + "]已存在"); + if (ObjectUtil.isNotEmpty(sysCodeRules)) { + throw new BadRequestException("编号[" + sysCodeRules.get(0).getCode() + "]已存在"); + } codeRule.setId(IdUtil.getSnowflake(1,1).nextIdStr()); codeRule.setCreate_id(currentUserId); codeRule.setCreate_name(currentUsername); @@ -170,7 +172,9 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper() .eq(SysCodeRule::getCode, codeRule.getCode()) .ne(SysCodeRule::getId, codeRule.getId())); - if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("该编码code已存在，请校验！"); + if (ObjectUtil.isNotEmpty(sysCodeRules)) { + throw new BadRequestException("该编码code已存在，请校验！"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java index 939d2ea..0cacf31 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java @@ -11,6 +11,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum CodeRuleTypeEnum { + /** + * + */ FIXED("01", "固定"), DATE("02", "日期"), ORDER("03", "顺序"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java index 8d159d8..93b36b3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java @@ -49,6 +49,11 @@ public interface ISysDeptService extends IService { * @param deptIds */ void saveUserDeptRelation(String UserId, Collection deptIds); + + /** + * 删除用户部门关系数据 + * @param user + */ void delUserDeptRelation(String user); /** @@ -63,8 +68,17 @@ public interface ISysDeptService extends IService { */ void delateDept(Set deptIds); + /** + * 创建部门 + * @param dept + */ void createDept(SysDept dept); + /** + * 获取部门数组 + * @param userId + * @return + */ List getUserDeptByUserId(String userId); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index ae50dfb..af58172 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.dict.dto.DictQuery; +import org.nl.wms.sch.task_manage.enums.FieldConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,14 +40,16 @@ public class SysDictServiceImpl extends ServiceImpl impleme @Override public IPage queryAll(Map whereJson, PageQuery page) { String blurry = null; - if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); + if (ObjectUtil.isNotEmpty(whereJson.get(FieldConstant.BLURRY))) { + blurry = whereJson.get("blurry").toString(); + } IPage pages = this.page(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() .select("MAX(dict_id) AS dict_id, code, name") .lambda() .like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry) .or(ObjectUtil.isNotEmpty(blurry)) .like(ObjectUtil.isNotEmpty(blurry), Dict::getName, blurry) - .orderBy(true, true, Dict::getCode) + .orderBy(true, true, Dict::getCode) .groupBy(Dict::getCode, Dict::getName)); return pages; } @@ -59,7 +62,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme String date = DateUtil.now(); List oldDict = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dict.getCode()), Dict::getCode, dict.getCode())); - if (ObjectUtil.isNotEmpty(oldDict)) throw new BadRequestException("字典[" + dict.getCode() + "]已存在"); + if (ObjectUtil.isNotEmpty(oldDict)) { + throw new BadRequestException("字典[" + dict.getCode() + "]已存在"); + } dict.setDict_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dict.setCreate_id(currentUserId); dict.setCreate_name(nickName); @@ -78,8 +83,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme throw new BadRequestException("字典不存在"); } List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dto.getCode())); - if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) + if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) { throw new BadRequestException("字典[" + dto.getCode() + "]已存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String currentNickName = SecurityUtils.getCurrentNickName(); // 根据code获取所有字典 @@ -130,7 +136,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme // 校验是否已经有标签 Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper().eq(Dict::getLabel, dict.getLabel()) .eq(Dict::getCode, dict.getCode())); - if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + if (ObjectUtil.isNotEmpty(one)) { + throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + } // 判断是否有空的值 List selectOne = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dict.getCode())); Dict dic = selectOne.get(0); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java index ee1fd9f..f380433 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java @@ -26,6 +26,8 @@ public interface ICodeGeneratorService extends IService { /** * 获得所有的表格信息 + * @param name + * @param pageQuery * @return */ IPage getTables(String name, PageQuery pageQuery); @@ -52,6 +54,12 @@ public interface ICodeGeneratorService extends IService { @Async void sync(IPage columnInfos, List columnInfoList); + /** + * 预览代码 + * @param byTableName + * @param columns + * @return + */ ResponseEntity preview(CodeGenConfig byTableName, IPage columns); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java index fa9f5c5..e61d4e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java @@ -73,7 +73,12 @@ public class CodeColumnConfig implements Serializable { @ApiModelProperty(value = "日期注解") private String date_annotation; - // 创建默认的实体 + /** + * 创建默认的实体 + * @param tableName + * @param config + * @return + */ public static CodeColumnConfig createDefault(String tableName, ColumnInfo config) { CodeColumnConfig columnConfig = new CodeColumnConfig(); columnConfig.setColumn_id(IdUtil.getSnowflake(1,1).nextIdStr()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java index 14b40a6..adaba90 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java @@ -61,7 +61,9 @@ public class StageImageServiceImpl extends ServiceImpl() .eq(StageImage::getImage_uuid, entity.getImage_uuid())); - if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (dto == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUsername = SecurityUtils.getCurrentUsername(); String currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java index 0f3b62b..d6a50e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java @@ -65,7 +65,9 @@ public class StageServiceImpl extends ServiceImpl implements @Override public void update(Stage dto) { Stage entity = stageMapper.selectOne(new LambdaQueryWrapper().eq(Stage::getStage_uuid, dto.getStage_uuid())); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } String currentUsername = SecurityUtils.getCurrentUsername(); String currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java index cd2f571..8018e89 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java @@ -23,8 +23,8 @@ public interface LuceneExecuteLogService { /** * 接口日志,会保留历史记录 - * - * @param luceneLogDto 日志结果对象 + * @param luceneLogDto + * @throws IOException 日志结果对象 */ void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java index 4bb3565..984ed1e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java @@ -1,12 +1,14 @@ package org.nl.system.service.lucene; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.springframework.data.domain.Pageable; import java.util.Map; - +/** + * @Author: lyd + * @Description: + * @Date: 2023/8/14 + */ public interface LuceneService { /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java index 0f5deac..0d2e801 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java @@ -64,7 +64,6 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { //向document对象中添加域。 if (ObjectUtil.isNotEmpty(luceneLogDto.getDevice_code())) { document.add(new StringField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES)); -// document.add(new TextField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES)); } if (ObjectUtil.isNotEmpty(luceneLogDto.getContent())) { document.add(new StringField("fieldContent", luceneLogDto.getContent(), Field.Store.YES)); @@ -90,7 +89,6 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { //实现日志文件按业务独立生成日志文件到指定路径 DynamicLogger loggerBuilder =new DynamicLogger(logPath+"\\"+luceneLogDto.getLogType()+"\\"); Logger logger = loggerBuilder.getLogger(luceneLogDto.getDevice_code()); -// logger.info("设备{}建立索引共耗时{}毫秒",luceneLogDto.getDevice_code(),endTime-startTime); logger.info("{}",luceneLogDto.toString()); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java index b672ea4..f8d912e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java @@ -98,7 +98,11 @@ public interface ISysMenuService extends IService { */ void update(SysMenu menu); - + /** + * 获取菜单数据 + * @param userId 用户列表 + * @return + */ List findByUser(String userId); /** @@ -108,8 +112,20 @@ public interface ISysMenuService extends IService { * @return / */ List buildMenus(List menuDtos); + + /** + * 构建菜单 + * @param menuDtos + * @param pid + * @return + */ List buildMenus(List menuDtos,String pid); + /** + * 构建菜单 + * @param systemType + * @return + */ List buildMenus(String systemType); /** @@ -134,6 +150,13 @@ public interface ISysMenuService extends IService { */ MenuDto doToDto(SysMenu sysMenu); + /** + * 获取菜单 + * @param roleId 角色标识 + * @param systemType 系统类型 + * @param category 目录 + * @return + */ List getMenusByRole(String roleId, String systemType, String category); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java index 4484d60..fcff8d6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java @@ -22,6 +22,11 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; +/** + * @Author: lyd + * @Description: 菜单 + * @Date: 2023/8/14 + */ @Data public class MenuDto extends BaseDTO implements Serializable { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index 7146a88..9806376 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -122,7 +122,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } } resources.setMenu_id(IdUtil.getStringId()); - if (resources.getPid().equals("0")) { + if ("0".equals(resources.getPid())) { resources.setPid(null); addSystemTypeDict(resources); } @@ -202,7 +202,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } } - if (resources.getPid().equals("0")) { + if ("0".equals(resources.getPid())) { resources.setPid(null); if (StringUtils.isNotEmpty(menu.getPid())){ addSystemTypeDict(resources); @@ -248,7 +248,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (menuId != null) { int count = baseMapper.findByPid(menuId).size(); SysMenu sysMenu = baseMapper.selectById(menuId); - if (ObjectUtil.isEmpty(sysMenu)) return; + if (ObjectUtil.isEmpty(sysMenu)) { + return; + } sysMenu.setSub_count(count); baseMapper.updateById(sysMenu); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java index 0028e78..3a00124 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java @@ -46,6 +46,7 @@ public interface ISysNoticeService extends IService { /** * 获取未读的接收消息条数 + * @return */ Integer countByReceiveNotRead(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java index 2443148..e87fc1d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java @@ -87,7 +87,9 @@ public class SysNoticeServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void create(Param param) { List code = paramMapper.selectByMap(MapOf.of("code", param.getCode())); - if (ObjectUtil.isNotEmpty(code)) throw new BadRequestException("编码不能一致"); + if (ObjectUtil.isNotEmpty(code)) { + throw new BadRequestException("编码不能一致"); + } param.setId(IdUtil.getSnowflake(1, 1).nextIdStr()); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java index 9cd2300..a3de796 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java @@ -12,8 +12,17 @@ import lombok.Getter; @AllArgsConstructor public enum DataScopeEnum { + /** + * 用户数据权限 + */ USER("user", "用户数据权限"), + /** + * 部门数据权限 + */ DEPT("dept", "部门数据权限"), + /** + * 自身数据权限 + */ SELF("self", "自身数据权限"); private final String code; private final String name; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java index cdee996..b29850c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java @@ -55,7 +55,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl().eq(SysDataPermission::getCode, permission.getCode())); - if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在"); + if (ObjectUtil.isNotEmpty(sysDataPermission)) { + throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在"); + } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -74,7 +76,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl ids) { ids.forEach(id -> { List permissions = userService.getUserDataPermissionByPermissionId(id); - if (ObjectUtil.isNotEmpty(permissions)) throw new BadRequestException("存在相关联的数据权限，请解除关联后删除"); + if (ObjectUtil.isNotEmpty(permissions)) { + throw new BadRequestException("存在相关联的数据权限，请解除关联后删除"); + } dataPermissionMapper.deleteById(id); }); } @@ -108,13 +114,19 @@ public class SysDataPermissionServiceImpl extends ServiceImpl().eq(SysDataPermission::getPermission_id, userDataPermissionDto.getPermission_id())); if (sysDataPermission.getCode().equals(DataScopeEnum.USER.getCode())) { // 用户权限 List userIds = dataPermissionMapper.findDataScopeUserIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermission_scope_type()); - if (ObjectUtil.isNotEmpty(userIds)) userDataPermissionDto.setUsers(userIds); + if (ObjectUtil.isNotEmpty(userIds)) { + userDataPermissionDto.setUsers(userIds); + } } else if (sysDataPermission.getCode().equals(DataScopeEnum.DEPT.getCode())) { // 部门权限 List deptIds = dataPermissionMapper.findDataScopeDeptIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermission_scope_type()); - if (ObjectUtil.isNotEmpty(deptIds)) userDataPermissionDto.setDepts(deptIds); + if (ObjectUtil.isNotEmpty(deptIds)) { + userDataPermissionDto.setDepts(deptIds); + } } else if (sysDataPermission.getCode().equals(DataScopeEnum.SELF.getCode())) { // 自身 List userIds = dataPermissionMapper.findDataScopeUserIdBySelfUserIdAndScopeType(userId, userDataPermissionDto.getPermission_scope_type()); - if (ObjectUtil.isNotEmpty(userIds)) userDataPermissionDto.setUsers(userIds); + if (ObjectUtil.isNotEmpty(userIds)) { + userDataPermissionDto.setUsers(userIds); + } } // 其他不做处理 }); @@ -126,7 +138,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl { */ void deleteJob(Set ids); + /** + * 执行子任务 + * @param tasks + * @throws InterruptedException + */ void executionSubJob(String[] tasks) throws InterruptedException; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java index a535ee9..b9ffebc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java @@ -13,6 +13,11 @@ import org.springframework.stereotype.Component; import java.util.List; +/** + * @Author: lyd + * @Description: job运行 + * @Date: 2023/8/14 + */ @Component @RequiredArgsConstructor @Order(100) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java index 6d8b526..c4c49a5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java @@ -22,7 +22,6 @@ public class AutoClearInteractionData { public void run(){ Param max_rows_to_keep = paramService.findByCode("max_rows_to_keep"); Param max_rows_to_delete = paramService.findByCode("max_rows_to_delete"); -// recordService.deleteByDay(interactionDay.getValue()); recordService.deleteByRows(max_rows_to_keep, max_rows_to_delete); log.info("run 执行成功"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java index 65ce2b2..c4c0c43 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java @@ -37,7 +37,8 @@ public class AutoClearLuceneData { // 获取时间戳 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); Date date = dateFormat.parse(String.valueOf(sevenDaysAgo)); - long unixTimestamp = date.getTime(); // 获取Unix时间戳 + // 获取Unix时间戳 + long unixTimestamp = date.getTime(); Query query = LongPoint.newRangeQuery("time", 0L, unixTimestamp); writer.deleteDocuments(query); writer.commit(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java index 55f7fbb..df9a2cf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java @@ -19,12 +19,33 @@ public class RedisKeyDefine { @AllArgsConstructor public enum KeyTypeEnum { + /** + * String + */ STRING("String"), + /** + * List + */ LIST("List"), + /** + * Hash + */ HASH("Hash"), + /** + * Set + */ SET("Set"), + /** + * Sorted Set + */ ZSET("Sorted Set"), + /** + * Stream + */ STREAM("Stream"), + /** + * Pub/Sub + */ PUBSUB("Pub/Sub"); /** @@ -39,9 +60,18 @@ public class RedisKeyDefine { @AllArgsConstructor public enum TimeoutTypeEnum { - FOREVER(1), // 永不超时 - DYNAMIC(2), // 动态超时 - FIXED(3); // 固定超时 + /** + * 永不超时 + */ + FOREVER(1), + /** + * 动态超时 + */ + DYNAMIC(2), + /** + * 固定超时 + */ + FIXED(3); /** * 类型 @@ -61,7 +91,6 @@ public class RedisKeyDefine { private final KeyTypeEnum keyType; /** * Value 类型 - * * 如果是使用分布式锁，设置为 {@link java.util.concurrent.locks.Lock} 类型 */ private final Class valueType; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java index 3b45c1d..2a2c864 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java @@ -12,17 +12,17 @@ public class RedisKeyRegistry { /** * Redis RedisKeyDefine 数组 */ - private static final List defines = new ArrayList<>(); + private static final List DEFINES = new ArrayList<>(); public static void add(RedisKeyDefine define) { - defines.add(define); + DEFINES.add(define); } public static List list() { - return defines; + return DEFINES; } public static int size() { - return defines.size(); + return DEFINES.size(); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java index 4570764..04019a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java @@ -20,6 +20,12 @@ import java.util.Set; */ public interface ISysRoleService extends IService { + /** + * 查询 + * @param param + * @param page + * @return + */ IPage query(Map param, PageQuery page); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 086c4d6..559b362 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.system.service.menu.dao.mapper.SysMenuMapper; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.role.dao.SysRole; import org.nl.system.service.role.dao.mapper.SysRoleMapper; +import org.nl.wms.sch.task_manage.enums.FieldConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,7 +45,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override public IPage query(Map param, PageQuery page) { String blurry = null; - if (ObjectUtil.isNotEmpty(param.get("blurry"))) blurry = param.get("blurry").toString(); + if (ObjectUtil.isNotEmpty(param.get(FieldConstant.BLURRY))) { + blurry = param.get("blurry").toString(); + } LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.like(ObjectUtil.isNotEmpty(blurry), SysRole::getName, blurry); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); @@ -59,12 +62,16 @@ public class SysRoleServiceImpl extends ServiceImpl impl public void create(JSONObject param) { //判断角色名字是否存在 String name = param.getString("name"); - if (StrUtil.isEmpty(name)) throw new BadRequestException("角色名字不能为空!"); + if (StrUtil.isEmpty(name)) { + throw new BadRequestException("角色名字不能为空!"); + } SysRole sysRole = JSONObject.parseObject(JSONObject.toJSONString(param), SysRole.class); //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName())); - if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + if (ObjectUtil.isNotEmpty(role)) { + throw new BadRequestException("角色【" + name + "】已存在!"); + } String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -86,12 +93,16 @@ public class SysRoleServiceImpl extends ServiceImpl impl SysRole sysRole = JSONObject.parseObject(JSONObject.toJSONString(param), SysRole.class); //判断角色名字是否存在 String name = sysRole.getName(); - if (StrUtil.isEmpty(name)) throw new BadRequestException("角色名字不能为空!"); + if (StrUtil.isEmpty(name)) { + throw new BadRequestException("角色名字不能为空!"); + } //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName()) .ne(SysRole::getRole_id, sysRole.getRole_id())); - if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + if (ObjectUtil.isNotEmpty(role)) { + throw new BadRequestException("角色【" + name + "】已存在!"); + } String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index ec0188a..2579c20 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -38,6 +38,7 @@ import org.nl.system.service.secutiry.dto.AuthUserDto; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dto.OnlineUserDto; +import org.nl.wms.sch.task_manage.GeneralDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; @@ -248,7 +249,8 @@ public class OnlineUserService { // 校验数据库 // 根据用户名查询，在比对密码 SysUser userInfo = sysUserService.getOne(new QueryWrapper().eq("username",authUser.getUsername())); - if (userInfo == null||!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 + // 这里需要密码加密 + if (userInfo == null||!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))) { throw new BadRequestException("账号或密码错误"); } @@ -270,8 +272,10 @@ public class OnlineUserService { // SaLoginModel 配置登录相关参数 StpUtil.login(userInfo.getUser_id(), new SaLoginModel() - .setDevice("PC") // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 - .setExtra("loginInfo", user) // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） + // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 + .setDevice("PC") + // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） + .setExtra("loginInfo", user) ); // 返回 token 与 用户信息 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java index 200b222..bb7ba66 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java @@ -20,6 +20,12 @@ import java.util.Set; */ public interface IToolLocalStorageService extends IService { + /** + * 查询 + * @param criteria + * @param pageable + * @return + */ IPage queryAll(ToolLocalStorageQuery criteria, PageQuery pageable); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java index 4a49142..e90cb8d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java @@ -85,7 +85,9 @@ public class ToolLocalStorageServiceImpl extends ServiceImpl { + /** + * 更新用户头像 + * @param avatar + * @return + */ Map updateAvatar(MultipartFile avatar); + /** + * 获取用户详情 + * @param query + * @param pageQuery + * @return + */ List getUserDetail(UserQuery query, PageQuery pageQuery); + /** + * 创建 + * @param userDetail + */ void create(Map userDetail); + /** + * 更新 + * @param userDetail + */ void update(Map userDetail); + /** + * 获取权限 + * @param permissionId + * @return + */ List getUserDataPermissionByPermissionId(String permissionId); + + /** + * 通过用户Id获取用户数据权限 + * @param userId + * @return + */ List getUserDataPermissionByUserId(String userId); + /** + * 删除用户权限 + * @param userId + */ void deleteDataPermissionById(String userId); + /** + * 插入数据权限 + * @param userDataPermissionDto + */ void insertDataPermission(UserDataPermissionDto userDataPermissionDto); + /** + * 获取用户 + * @param deptId + * @return + */ List getUserIdByDeptId(String deptId); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 35bf732..23d4ec1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -21,6 +21,8 @@ import org.nl.system.service.user.dto.SysUserDetail; import org.nl.system.service.user.dto.UserDataPermissionDto; import org.nl.system.service.user.dto.UserQuery; import org.apache.commons.beanutils.BeanUtils; +import org.nl.wms.sch.task_manage.GeneralDefinition; +import org.nl.wms.sch.task_manage.enums.FieldConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -81,25 +83,25 @@ public class ISysUserServiceImpl extends ServiceImpl imp BeanUtils.populate(sysUser,userDetail); // 默认密码 123456 if (ObjectUtil.isEmpty(sysUser.getPassword())) { - sysUser.setPassword(SaSecureUtil.md5BySalt("123456", "salt")); + sysUser.setPassword(SaSecureUtil.md5BySalt(GeneralDefinition.DEFAULT_PASSWORD, GeneralDefinition.SALT)); } else { - sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), "salt")); + sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), GeneralDefinition.SALT)); } String userId = IdUtil.getStringId(); sysUser.setUser_id(userId); this.save(sysUser); - if (userDetail.get("depts") !=null){ - deptService.saveUserDeptRelation(userId,(List)userDetail.get("depts")); + if (userDetail.get(FieldConstant.DEPTS) !=null){ + deptService.saveUserDeptRelation(userId,(List)userDetail.get(FieldConstant.DEPTS)); }; - if (userDetail.get("roles") !=null){ - roleService.saveUserRoleRelation(userId,(List)userDetail.get("roles")); + if (userDetail.get(FieldConstant.ROLES) !=null){ + roleService.saveUserRoleRelation(userId,(List)userDetail.get(FieldConstant.ROLES)); }; } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void update(Map userDetail) { - if(CollectionUtils.isEmpty(userDetail) || ObjectUtil.isEmpty(userDetail.get("user_id"))){ + if(CollectionUtils.isEmpty(userDetail) || ObjectUtil.isEmpty(userDetail.get(FieldConstant.USER_ID))){ return; } @@ -109,7 +111,7 @@ public class ISysUserServiceImpl extends ServiceImpl imp ConvertUtils.register((aClass, o) -> { try { if (o == null){ return null; } - return new SimpleDateFormat("yyyy-MM-dd").parse(o.toString()); + return new SimpleDateFormat(GeneralDefinition.DATE_FORMAT).parse(o.toString()); }catch (Exception ex){ return null; } @@ -122,11 +124,11 @@ public class ISysUserServiceImpl extends ServiceImpl imp sysUser.setUpdate_time(new Date()); sysUser.setUpdate_id(SecurityUtils.getCurrentUserId()); this.updateById(sysUser); - if (userDetail.get("deptIds")!=null){ + if (userDetail.get(FieldConstant.DEPTIDS)!=null){ deptService.delUserDeptRelation(sysUser.getUser_id()); deptService.saveUserDeptRelation(sysUser.getUser_id(), (List) userDetail.get("deptIds")); }; - if (userDetail.get("rolesIds") !=null){ + if (userDetail.get(FieldConstant.ROLESIDS) !=null){ roleService.delUserRoleRelation(sysUser.getUser_id()); roleService.saveUserRoleRelation(sysUser.getUser_id(),(List) userDetail.get("rolesIds")); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 6b17a37..a793cff 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -24,12 +24,13 @@ import java.util.concurrent.ThreadPoolExecutor; public class CockpitServiceImpl implements CockpitService { @Autowired private CockPitMapper cockPitMapper; + private ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); @Override public ConcurrentHashMap PressedMonitor() { - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); ConcurrentHashMap map = new ConcurrentHashMap<>(); // 1、当前班次、计划生产、已生产、不合格产品数 - String dayShift = CommonUtils.getDayShift(); // 白班、晚班 + // 白班、晚班 + String dayShift = CommonUtils.getDayShift(); map.put("DayShift", dayShift); CompletableFuture> listCompletableFuture = CompletableFuture.supplyAsync( () -> cockPitMapper.getPressProductHeaderList(dayShift), pool); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java index 30aee37..76a68d4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java @@ -11,6 +11,11 @@ import java.util.List; * @Date: 2023/9/25 */ public interface CockPitMapper { + /** + * 获取当班信息 + * @param dayShift + * @return + */ List getPressProductHeaderList(String dayShift); /** @@ -20,10 +25,23 @@ public interface CockPitMapper { */ List getShiftProductionList(String dayShift); + /** + * 人员月生产 + * @param dayShift + * @return + */ List getPersonnelMonthlyProductionList(String dayShift); + /** + * 生产任务 + * @return + */ List getProductionTaskList(); + /** + * 当月工单 + * @return mes系统的直接数据 + */ @DS("oracle") List getMonthlyWorkOrderFutureList(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java index 93951d9..86d4074 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java @@ -25,9 +25,10 @@ public interface IDasDeviceCheckRecordService extends IService queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * @param entity + * @return + */ PdaResponseVo create(DasDeviceCheckRecord entity); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java index ced56a9..fc0c9d2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java @@ -58,7 +58,9 @@ public class DasDeviceCheckRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * @param entity + * @return + */ PdaResponseVo create(DasDeviceOperationRecord entity); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java index 1fecb41..5acfba5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java @@ -59,7 +59,9 @@ public class DasDeviceOperationRecordServiceImpl extends ServiceImpl ids); + /** + * 记录质检信息 + * @param applyTaskRequest + */ void createByAcs(ApplyTaskRequest applyTaskRequest); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java index 6241bdb..611cd79 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java @@ -66,7 +66,9 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl pointLam = new QueryWrapper().lambda(); pointLam.eq(SchBasePoint::getPoint_code, deviceCode); - SchBasePoint one = pointService.getOne(pointLam); // 拆垛工位 + // 拆垛工位 + SchBasePoint one = pointService.getOne(pointLam); // 生产中的工单， 如果ACS能给就直接查 PdmBdWorkorder deviceProductionTask = workorderService.getDeviceProductionTask(one.getParent_point_code()); if (ObjectUtil.isEmpty(deviceProductionTask)) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java index 9827cb0..d4c3bda 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java @@ -55,7 +55,9 @@ public class MdBaseBrickInfoServiceImpl extends ServiceImpl buildTree(ArrayList list); + /** + * 根据编码获取分类名称下拉框 + * @param code + * @return + */ List getClassByCode(String code); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java index 8e7d54e..47e2dfa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java @@ -15,11 +15,13 @@ import org.nl.wms.database.classification.service.IMdBaseClassstandardService; import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; import org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper; import org.nl.wms.database.classification.service.dto.MdBaseClassstandardTrees; +import org.nl.wms.sch.task_manage.GeneralDefinition; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -34,7 +36,7 @@ import java.util.stream.Collectors; @Service public class MdBaseClassstandardServiceImpl extends ServiceImpl implements IMdBaseClassstandardService { - @Autowired + @Resource private MdBaseClassstandardMapper mdBaseClassstandardMapper; @Override @@ -50,14 +52,14 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl pages = new Page<>(page.getPage() + 1, page.getSize()); mdBaseClassstandardMapper.selectPage(pages, lam); pages.getRecords().forEach(classstandard -> { - classstandard.setIs_leaf(!(classstandard.getSub_count() > 0)); + classstandard.setIs_leaf(classstandard.getSub_count() <= 0); classstandard.setHasChildren(classstandard.getSub_count() > 0); }); return pages; } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void create(MdBaseClassstandard entity) { // 判断是否存在 MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper @@ -65,7 +67,8 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl classList = mdBaseClassstandardMapper - .selectList(new LambdaQueryWrapper().eq(MdBaseClassstandard::getParent_class_id, parentClassId)); + .selectList(new LambdaQueryWrapper() + .eq(MdBaseClassstandard::getParent_class_id, parentClassId)); int size = classList.size(); classObject.setSub_count(size); classObject.setIs_leaf(size > 0); @@ -104,7 +111,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl() @@ -119,10 +128,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl classstandardList = mdBaseClassstandardMapper.selectList(lam); classstandardList.forEach(classstandard -> { classstandard.setHasChildren(classstandard.getSub_count() > 0); - classstandard.setLeaf(!(classstandard.getSub_count() > 0)); + classstandard.setLeaf(classstandard.getSub_count() <= 0); classstandard.setId(classstandard.getClass_id()); classstandard.setLabel(classstandard.getClass_name()); }); @@ -190,7 +198,7 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl getSuperior(MdBaseClassstandard classstandard, ArrayList res) { - if (ObjectUtil.isEmpty(classstandard.getParent_class_id()) || classstandard.getParent_class_id().equals("0")) { + if (ObjectUtil.isEmpty(classstandard.getParent_class_id()) || "0".equals(classstandard.getParent_class_id())) { // 父类id为空或者是0就是顶级类别 List classstandardList = mdBaseClassstandardMapper .selectList(new LambdaQueryWrapper() @@ -215,14 +223,15 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl { classstandard.setId(classstandard.getClass_id()); classstandard.setLabel(classstandard.getClass_name()); - classstandard.setLeaf(!(classstandard.getSub_count() > 0)); + classstandard.setLeaf(classstandard.getSub_count() <= 0); classstandard.setHasChildren(classstandard.getSub_count() > 0); }); - List trees = new ArrayList<>(); // 待返回数据 + // 待返回数据 + List trees = new ArrayList<>(); for (MdBaseClassstandard mdBaseClassstandard : list) { // 筛选父类的值 if (ObjectUtil.isEmpty(mdBaseClassstandard.getParent_class_id()) - || mdBaseClassstandard.getParent_class_id().equals("0")) { + || "0".equals(mdBaseClassstandard.getParent_class_id())) { // collect：获取当前对象的所有子级 List collect = list.stream().filter(t -> t.getParent_class_id() .equals(mdBaseClassstandard.getClass_id())).collect(Collectors.toList()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java index 35eac06..29f26f0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java @@ -43,6 +43,11 @@ public interface IMdBaseMaterialService extends IService { */ void deleteAll(Set ids); + /** + * 根据物料编码获取物料信息 + * @param materialCode + * @return + */ MdBaseMaterial findByCode(String materialCode); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java index 9624d55..f6f9016 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java @@ -85,7 +85,9 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl " + basePoint.getPoint_code()); } @@ -752,7 +752,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { groupInfo.setInto_kiln_time(DateUtil.now()); if (ObjectUtil.isNotEmpty(basePoint)) { // 记录当前位置 - groupInfo.setPoint_code(basePoint.getPoint_code()); // 当前位置 + groupInfo.setPoint_code(basePoint.getPoint_code()); groupInfo.setPoint_name(basePoint.getPoint_name()); groupInfo.setMove_way(groupInfo.getMove_way() + " -> " + basePoint.getPoint_code()); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java index 9e42544..6a81223 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java @@ -17,6 +17,7 @@ import java.util.List; public interface WmsToMesService { /** * wms上报mes泥料消耗记录 + * @param mesMudConsumptionDto */ void reportMudConsumption(MesMudConsumptionDto mesMudConsumptionDto); @@ -37,6 +38,7 @@ public interface WmsToMesService { /** * wms入滚筒线上报半成品入库信息 + * @param groupId */ void reportSemiProductionInfoIn(String groupId); @@ -135,6 +137,11 @@ public interface WmsToMesService { */ int getTotal(String materialId); + /** + * 获取用户实体 + * @param custerName + * @return + */ CusterDo getCusterByName(String custerName); /** @@ -157,5 +164,9 @@ public interface WmsToMesService { */ IPage queryMesScrapInfo(ScrapQuery query, PageQuery page); + /** + * 新增工序报废 + * @param entity + */ void addScrap(ScrapDto entity); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java index e646a89..895e3c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java @@ -251,8 +251,6 @@ public class WmsToMesServiceImpl implements WmsToMesService { @Override @Async public void reportGdyMaterialInfoIn(SchBaseVehiclematerialgroup vehiclematerialgroup) { - // 获取组盘信息 -// SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(groupId); String workorderCode = vehiclematerialgroup.getWorkorder_code(); // 获取工单 PdmBdWorkorder workorder = pdmBdWorkorderService.getByCode(workorderCode); @@ -348,7 +346,7 @@ public class WmsToMesServiceImpl implements WmsToMesService { @Override @Async public void reportPressUnusedMaterial(PdmBdWorkorder orderObj) { - if (orderObj.getRegion_code().equals("FJ")) { + if (GeneralDefinition.AREA_FJ.equals(orderObj.getRegion_code())) { return; // 分拣不需要 } // 获取统计数量 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java index 77019f4..dfd2613 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java @@ -8,5 +8,9 @@ import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; * @Date: 2023/9/7 */ public interface WmsToMmsService { + /** + * 混碾对接 + * @param workorder + */ void addRequestMaterial(PdmBdWorkorder workorder); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java index f01f4ac..61330a4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java @@ -50,11 +50,14 @@ public interface ISysInteractRecordService extends IService { /** * 创建记录 + * @param request + * @param response + * @param direction */ void saveRecord(Object request, BaseResponse response, String direction); /** - * + * 记录对接日志 * @param workorder * @param resultForAcs * @param direction @@ -81,6 +84,7 @@ public interface ISysInteractRecordService extends IService { /** * 获取所有标题 + * @return */ List getAllInteractName(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java index c5381e9..552e6ce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java @@ -75,7 +75,9 @@ public class SysInteractRecordServiceImpl extends ServiceImpl getDeviceInfo(); + /** + * 获取设备状态 + * @return + */ List getDeviceStatus(); + /** + * 设备动作 + * @return + */ List deviceAction(); + /** + * 人工通过手持组盘 + * @param entity + * @return + */ PdaResponseVo manualCreateByPda(ManualGroupDto entity); + /** + * 获取混碾机编码 + * @return + */ List getBlendingCode(); + /** + * 生成混碾->压机任务 + * @param blendingMoveDto + * @return + */ PdaResponseVo sendTask(BlendingMoveDto blendingMoveDto); + /** + * 强制静置 + * @param forcedRestingDto + * @return + */ PdaResponseVo forcedResting(ForcedRestingDto forcedRestingDto); - + /** + * 显示静置时长 + * @return + */ List forcedRestingShow(); + /** + * 获取载具类型 + * @return + */ List getVehicleType(); + /** + * 人工分拣-显示工单 + * @return + */ List manualOrders(); + /** + * 人工分拣-开工 + * @param manualSortingDto + * @return + */ PdaResponseVo productionScheduling(ManualSortingDto manualSortingDto); + /** + * 人工分拣-完工 + * @param manualSortingDto + * @return + */ PdaResponseVo productionComplete(ManualSortingDto manualSortingDto); + /** + * 人工分拣-空盘入库-动作 + * @return + */ PdaResponseVo emptyDiskIntoStorageTask(); + /** + * 人工分拣-空盘入库-显示任务信息 + * @return + */ List emptyDiskIntoStorageShow(); + /** + * 人工分拣-呼叫木托盘-动作 + * @return + */ PdaResponseVo callingWoodenPalletTask(); + /** + * 人工分拣-呼叫木托盘-显示任务信息 + * @return + */ List callingWoodenPalletTaskShow(); + /** + * 人工分拣-呼叫物料-动作 + * @return + */ PdaResponseVo callingMaterialTask(); + /** + * 人工分拣-呼叫物料-显示任务信息 + * @return + */ List callingMaterialTaskShow(); + /** + * 人工分拣-剩料入库-动作 + * @param manualResidueInDto + * @return + */ PdaResponseVo callingResidueMaterialTask(ManualResidueInDto manualResidueInDto); + /** + * 人工分拣-剩料入库-显示任务信息 + * @return + */ List callingResidueMaterialTaskShow(); + /** + * 人工分拣-包装入库-动作 + * @param manualResidueInDto + * @return + */ PdaResponseVo packingTask(ManualResidueInDto manualResidueInDto); + /** + * 人工分拣-包装入库-显示任务信息 + * @return + */ List packingTaskShow(); + /** + * 人工分拣-载具绑定 + * @param vehicleBindingDto + * @return + */ PdaResponseVo bindingVehicle(VehicleBindingDto vehicleBindingDto); + /** + * 压机送料-动作 + * @param pressMoveDto + * @return + */ PdaResponseVo pressTask(PressMoveDto pressMoveDto); + /** + * 货架盘点-物料查询 + * @param commonQueryDto + * @return + */ List materialQuery(CommonQueryDto commonQueryDto); + /** + * 货架盘点-更新 + * @param shelfSaveDto + * @return + */ PdaResponseVo updateData(ShelfSaveDto shelfSaveDto); + /** + * 压机送料-下拉框 + * @return + */ List pressPointList(); + /** + * 要料信息-查询 + * @return + */ List requestInfo(); + /** + * 要料信息-查询 + * @param requestMaterialInfoVo + * @return + */ PdaResponseVo deleteMaterialInfo(RequestMaterialInfoVo requestMaterialInfoVo); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 13bbc55..ac1ae90 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -96,7 +96,6 @@ public class PdaServiceImpl implements PdaService { } // 获取压机工单 PdmBdWorkorder bdWorkorder = workorderService.getDeviceProductionTask(entity.getPoint_code()); -// PdmBdWorkorder bdWorkorder = workorderService.getByCode(entity.getOrder_code()); // 获取点位 SchBasePoint basePoint = pointService.getById(entity.getPoint_code()); // 获取物料 @@ -193,6 +192,7 @@ public class PdaServiceImpl implements PdaService { throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已开工"); case "5": throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已完工"); + default: break; } // 开工 bdWorkorder.setOperator(manualSortingDto.getUsername()); @@ -215,6 +215,7 @@ public class PdaServiceImpl implements PdaService { throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]未开工"); case "5": throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已完工"); + default: break; } TaskUtils.setWorkOrderUpdateByPC(bdWorkorder); bdWorkorder.setRealproduceend_date(DateUtil.now()); @@ -436,7 +437,7 @@ public class PdaServiceImpl implements PdaService { group.setSource_vehicle_code(basePoint.getPoint_code()); group.setMove_way(basePoint.getPoint_code()); group.setPcsn(DateUtil.format(DateUtil.date(), "yyyyMMdd")); - group.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); // 暂时不维护。 + group.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); group.setIs_delete(false); group.setIs_full(true); group.setCreate_id(SecurityUtils.getCurrentUserId()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/backup b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/backup index 96cef7f..7d27ccb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/backup +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/backup @@ -29,14 +29,14 @@ groupEntity.setVehicle_code(blendingMoveDto.getVehicle_code()); groupEntity.setVehicle_type(GeneralDefinition.MATERIAL_CUP); groupEntity.setSource_vehicle_code(startPoint.getPoint_code()); - groupEntity.setPoint_code(startPoint.getPoint_code()); // 当前位置 + groupEntity.setPoint_code(startPoint.getPoint_code()); groupEntity.setPoint_name(startPoint.getPoint_name()); groupEntity.setMove_way(startPoint.getPoint_code()); // 头次 // groupEntity.setMix_times(mixTimes); // 碾次 groupEntity.setInstorage_time(DateUtil.now()); // groupEntity.setMaterial_weight(blendingMoveDto.getMaterial_weight()); - groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); // 绑定 - groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); // 暂时不维护。 + groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); + groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); groupEntity.setIs_delete(false); // groupEntity.setExt_data(packNo);// todo: 对于混碾的组盘 暂时存吨袋号 vehiclematerialgroupService.saveOrUpdate(groupEntity); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java index 6fa916b..2dfbdf2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java @@ -24,9 +24,10 @@ public interface IPdmBdMudConsumptionService extends IService queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * @param entity + * @return + */ String create(PdmBdMudConsumption entity); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java index aaa4209..c3eabc0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java @@ -53,7 +53,9 @@ public class PdmBdMudConsumptionServiceImpl extends ServiceImpl { */ PdmBdWorkorder getDeviceProductionTask(String deviceCode); + /** + * 根据工单编码获取工单信息 + * @param orderCode + * @return + */ PdmBdWorkorder getByCode(String orderCode); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java index 09eef00..6251b46 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java @@ -9,25 +9,81 @@ import lombok.Data; */ @Data public class AcsWorkOrderVo { - private String workorder_code; // 工单编码 - private String device_code; // 设备编码 - private String material_code; // 半成品物料编码 - 工单物料编码 - private String product_code; // 产品代号 - 规格 - private String formula; // 配方 - 型号 - private String brick_code; // 砖型编码 - 自己维护 - private String plan_qty; // 计划数量 - private String a; // a边 - private String b; // b边 - private String h; // 高度 - private String w; // 宽度 - private String size_error; // 尺寸允许误差 - private String single_weight; // 单重允许误差 - // private String drawing_address; // 图纸地址 - private String standard_size_height1; // 标准尺寸1 - private String standard_size_height2; // 标准尺寸2 - private String standard_size_height3; // 标准尺寸3 - private String standard_size_height4; // 标准尺寸4 - private String standard_weight; // 标准重量 - private String detection_error; // 检测误差值 - 不用传 + /** + * 工单编码 + */ + private String workorder_code; + /** + * 设备编码 + */ + private String device_code; + /** + * 半成品物料编码 - 工单物料编码 + */ + private String material_code; + /** + * 产品代号 - 规格 + */ + private String product_code; + /** + * 配方 - 型号 + */ + private String formula; + /** + * 砖型编码 - 自己维护 + */ + private String brick_code; + /** + * 计划数量 + */ + private String plan_qty; + /** + * a边 + */ + private String a; + /** + * b边 + */ + private String b; + /** + * 高度 + */ + private String h; + /** + * 宽度 + */ + private String w; + /** + * 尺寸允许误差 + */ + private String size_error; + /** + * 单重允许误差 + */ + private String single_weight; + /** + * 标准尺寸1 + */ + private String standard_size_height1; + /** + * 标准尺寸2 + */ + private String standard_size_height2; + /** + * 标准尺寸3 + */ + private String standard_size_height3; + /** + * 标准尺寸4 + */ + private String standard_size_height4; + /** + * 标准重量 + */ + private String standard_weight; + /** + * 检测误差值 - 不用传 + */ + private String detection_error; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index d709624..f8de313 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -101,7 +101,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl intoKilnReport(Map json, PageQuery page); + /** + * 出窑窑记录报表 + * @param json + * @param page + * @return + */ IPage outKilnReport(Map json, PageQuery page); + /** + * 窑内物料实时报表 + * @param json + * @param page + * @return + */ IPage inKilnReport(Map json, PageQuery page); /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index dd80b74..242b311 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -13,7 +13,7 @@ FROM `sch_base_vehiclematerialgroup` vg LEFT JOIN md_base_material m ON m.material_id = vg.material_id - WHERE vg.into_kiln_time IS NOT NULL + WHERE vg.into_kiln_time IS NOT NULL AND vg.group_bind_material_status = '2'