From 931bb1270b1e28800cb719e098aa238a513fe167 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 6 Aug 2024 13:38:52 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=8E=BB=E9=99=A4jetcache,=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=BE=BE=E6=A2=A6=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/nlsso-server/pom.xml | 18 ++++------- .../src/main/java/org/nl/AppRun.java | 4 --- .../java/org/nl/common/utils/GenUtil.java | 2 +- .../service/dept/dao/mapper/SysDeptMapper.xml | 4 +-- .../service/param/ISysParamService.java | 4 --- .../dao/mapper/SysDataPermissionMapper.xml | 2 +- .../service/role/dao/mapper/SysRoleMapper.xml | 2 +- .../user/impl/ISysUserServiceImpl.java | 6 ++-- .../second_floor_area/CallEmpReelTask.java | 20 ++++++------- .../task/second_floor_area/CoolCutTask.java | 16 ++++------ .../task/second_floor_area/InCoolIvtTask.java | 4 +-- .../task/second_floor_area/InHotTask.java | 13 ++++---- .../task/second_floor_area/OutHotTask.java | 4 +-- .../main/resources/config/application-dev.yml | 6 ++++ .../src/main/resources/config/application.yml | 30 +++++-------------- .../src/main/resources/logback-spring.xml | 2 +- .../src/test/java/org/nl/ApplicationTest.java | 4 +-- nladmin-ui/src/views/system/user/index.vue | 2 +- 18 files changed, 57 insertions(+), 86 deletions(-) diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 8ad737a..b86e284 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -32,6 +32,11 @@ + + com.dameng + DmJdbcDriver18 + 8.1.1.193 + org.flywaydb @@ -354,19 +359,6 @@ commons-configuration ${configuration.version} - - - com.alicp.jetcache - jetcache-starter-redis - 2.7.3 - - - - redis.clients - jedis - 4.3.1 - - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 447bfb3..feef8d3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -1,8 +1,6 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; -import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; -import com.alicp.jetcache.anno.config.EnableMethodCache; import org.dromara.dynamictp.core.spring.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.nl.config.SpringContextHolder; @@ -31,8 +29,6 @@ import org.springframework.web.bind.annotation.RestController; @EnableDynamicTp @ServletComponentScan @EnableTransactionManagement -@EnableMethodCache(basePackages = "org.nl") -@EnableCreateCacheAnnotation @MapperScan("org.nl.**.mapper") public class AppRun implements ApplicationRunner { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java index 21796f2..c475492 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java @@ -412,7 +412,7 @@ public class GenUtil { // 生成代码 genFile(file, template, genMap); } - + // 生成前端代码 templates = getFrontTemplateNames(); for (String templateName : templates) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml index 8f4acca..44aef21 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml @@ -3,7 +3,7 @@ - replace into sys_user_dept values + insert into sys_user_dept values (#{user},#{dept}) @@ -46,7 +46,7 @@ SELECT d.dept_id FROM - `sys_user_dept` d + sys_user_dept d WHERE d.user_id = #{userId} ) AND sd.is_used = TRUE diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java index 2a65119..4acb33f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java @@ -1,8 +1,6 @@ package org.nl.system.service.param; -import com.alicp.jetcache.anno.*; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.param.dao.Param; @@ -42,7 +40,6 @@ public interface ISysParamService extends IService { * * @param param */ - @CacheUpdate(name = "paramDataCode.", key = "#param.code", value = "#param") void update(Param param); /** @@ -58,6 +55,5 @@ public interface ISysParamService extends IService { * @param code * @return Param */ - @Cached(name = "paramDataCode.", key = "#code", expire = 3600, cacheType = CacheType.REMOTE) Param findByCode(String code); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml index 7311d1f..2dc96f2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml @@ -43,7 +43,7 @@ dp.`name` as permissionName, permission.permission_id FROM - `sys_data_scope` scop + sys_data_scope scop LEFT JOIN sys_user_data_permission permission ON scop.permission_scope_type = permission.permission_scope_type AND permission.user_id = scop.self_user_id LEFT JOIN sys_data_permission dp ON permission.permission_id = dp.permission_id LEFT JOIN sys_dept dept ON scop.dept_id = dept.dept_id diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml index 3d54ea7..463c2c8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml @@ -3,7 +3,7 @@ - replace into sys_users_roles values + insert into sys_users_roles values (#{user},#{role}) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 9f025f6..fe20ec2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -69,8 +69,10 @@ public class ISysUserServiceImpl extends ServiceImpl imp @Override public List getUserDetail(UserQuery query, PageQuery pageQuery) { - List userDetail = sysUserMapper.getUserDetail(query, pageQuery); - return userDetail; + if (ObjectUtil.isNotEmpty(query.getIs_used())) { + query.setIs_used(Boolean.parseBoolean(query.getIs_used())?"1":"0"); + } + return sysUserMapper.getUserDetail(query, pageQuery); } @Override diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java index 9b1a3a3..a6f0236 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java @@ -2,34 +2,34 @@ package org.nl.wms.sch.task_manage.task.second_floor_area; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.*; +import cn.hutool.core.util.BooleanUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.nl.common.exception.BadRequestException; -import org.nl.config.language.LangProcess; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; 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.wms.basedata.material.dao.MdMeMaterialbase; import org.nl.wms.basedata.material.service.ImdMeMaterialbaseService; -import org.nl.wms.md.service.ImdPbInterfacebackService; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.bi.service.IpdmBiSlittingproductionplanService; import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; import org.nl.wms.pdm.ivt.dao.StIvtSbpointivt; -import org.nl.wms.pdm.ivt.service.*; -import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.pdm.ivt.service.IstIvtCoolpointivtService; +import org.nl.wms.pdm.ivt.service.IstIvtCoolregionioService; +import org.nl.wms.pdm.ivt.service.IstIvtSbpointivtService; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CoolCutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CoolCutTask.java index 5fb9536..75248a7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CoolCutTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CoolCutTask.java @@ -4,11 +4,10 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -18,17 +17,14 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; 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.wms.md.service.ImdPbInterfacebackService; import org.nl.wms.pdm.bi.dao.PdmBiSlittingproductionplan; -import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; import org.nl.wms.pdm.bi.service.IpdmBiSlittingproductionplanService; import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; import org.nl.wms.pdm.ivt.dao.StIvtCutpointivt; -import org.nl.wms.pdm.ivt.service.*; -import org.nl.wms.pdm.ivt.service.impl.StIvtCutpointivtServiceImpl; -import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.pdm.ivt.service.IstIvtCoolpointivtService; +import org.nl.wms.pdm.ivt.service.IstIvtCoolregionioService; +import org.nl.wms.pdm.ivt.service.IstIvtCutpointivtService; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AbstractTask; @@ -37,13 +33,11 @@ import org.nl.wms.sch.task_manage.enums.PackageInfoIvtEnum; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.nl.wms.util.TaskUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InCoolIvtTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InCoolIvtTask.java index c90f524..3f3f895 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InCoolIvtTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InCoolIvtTask.java @@ -7,8 +7,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InHotTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InHotTask.java index 6d8c45f..9667033 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InHotTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/InHotTask.java @@ -7,8 +7,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -19,17 +19,17 @@ import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; 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.param.impl.SysParamServiceImpl; -import org.nl.wms.basedata.material.service.ImdMeMaterialbaseService; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; -import org.nl.wms.pdm.bi.service.IpdmBiSlittingproductionplanService; import org.nl.wms.pdm.ivt.dao.StIvtCoolpointivt; import org.nl.wms.pdm.ivt.dao.StIvtCoolregionio; import org.nl.wms.pdm.ivt.dao.StIvtHotpointivt; import org.nl.wms.pdm.ivt.dao.StIvtHotregioniomst; -import org.nl.wms.pdm.ivt.service.*; +import org.nl.wms.pdm.ivt.service.IstIvtCoolpointivtService; +import org.nl.wms.pdm.ivt.service.IstIvtCoolregionioService; +import org.nl.wms.pdm.ivt.service.IstIvtHotpointivtService; +import org.nl.wms.pdm.ivt.service.IstIvtHotregioniomstService; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -45,7 +45,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.HashMap; import java.util.Map; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/OutHotTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/OutHotTask.java index fcf3aa1..a832b81 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/OutHotTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/OutHotTask.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 9ee61a8..5dc7981 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -26,5 +26,11 @@ nl: username: sa password: 123 database: 马钢_RH + dm: + ip: localhost + port: 5236 + scheme: NLADMIN + username: NLADMIN + password: 123456789 logging-path: C:\log\wms dynamic-log-path: C:\log\lms diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 8e931c6..40f1d7e 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -53,7 +53,7 @@ spring: login-username: admin login-password: admin dynamic: - primary: mysql + primary: dm datasource: mysql: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy @@ -73,9 +73,15 @@ spring: username: ${DB_USER:${nl.config.sqlserver.username}} password: ${DB_PWD:${nl.config.sqlserver.password}} type: com.alibaba.druid.pool.DruidDataSource + dm: + driver-class-name: dm.jdbc.driver.DmDriver + url: jdbc:dm://${nl.config.dm.ip}:${nl.config.dm.port}/${nl.config.dm.scheme}?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 + username: ${nl.config.dm.username} + password: ${nl.config.dm.password} + type: com.alibaba.druid.pool.DruidDataSource flyway: #开启 - enabled: true + enabled: false #当迁移时发现目标schema非空，而且带有没有元数据的表时，是否自动执行基准迁移，默认false. baseline-on-migrate: true # 检测迁移脚本的路径是否存在，如不存在，则抛出异常 @@ -284,23 +290,3 @@ sa-token: password: # 连接超时时间 timeout: 10s -jetcache: - statIntervalMinutes: 15 - areaInCacheName: false - local: - default: - type: linkedhashmap - keyConvertor: fastjson - remote: - default: - type: redis - keyConvertor: fastjson2 - broadcastChannel: projectA - valueEncoder: java - valueDecoder: java - poolConfig: - minIdle: 5 - maxIdle: 20 - maxTotal: 50 - host: ${nl.config.redis.ip} - port: ${nl.config.redis.port} diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index aaedad5..2f22eab 100644 --- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999 nlAdmin + value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %cyan(%msg%n)"/>