rev: 去除jetcache, 新增达梦测试

nladmin-system/nlsso-server/pom.xml

@@ -32,6 +32,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.1.193</version>
+        </dependency>
         <!--flywaydb-->
         <dependency>
             <groupId>org.flywaydb</groupId>
@@ -354,19 +359,6 @@
             <artifactId>commons-configuration</artifactId>
             <version>${configuration.version}</version>
         </dependency>
-        <!--  ******************  -->
-        <dependency>
-            <groupId>com.alicp.jetcache</groupId>
-            <artifactId>jetcache-starter-redis</artifactId>
-            <version>2.7.3</version>
-        </dependency>
-        <!--        jetcache2.7.x版本需要额外添加该依赖-->
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>4.3.1</version>
-        </dependency>
-
 
         <!--   https://www.jianshu.com/p/e40d111c7bfc?utm_source=oschina-app     热部署 https://zhuanlan.zhihu.com/p/63381268-->
 

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 {
 

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) {

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.nl.system.service.dept.dao.mapper.SysDeptMapper">
 
     <insert id="saveDeptRelation">
-        replace into sys_user_dept values
+        insert into sys_user_dept values
         <foreach collection="depts"  item="dept" separator=",">
            (#{user},#{dept})
         </foreach>
@@ -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
     </select>

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 param
      */
-    @CacheUpdate(name = "paramDataCode.", key = "#param.code", value = "#param")
     void update(Param param);
 
     /**
@@ -58,6 +55,5 @@ public interface ISysParamService extends IService<Param> {
      * @param code
      * @return Param
      */
-    @Cached(name = "paramDataCode.", key = "#code", expire = 3600, cacheType = CacheType.REMOTE)
     Param findByCode(String code);
 }

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

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.nl.system.service.role.dao.mapper.SysRoleMapper">
 
     <insert id="saveRoleRelation">
-        replace into sys_users_roles values
+        insert into sys_users_roles values
         <foreach collection="roles"  item="role" separator=",">
            (#{user},#{role})
         </foreach>

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java

@@ -69,8 +69,10 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
 
     @Override
     public List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery) {
-        List<SysUserDetail> userDetail = sysUserMapper.getUserDetail(query, pageQuery);
+        if (ObjectUtil.isNotEmpty(query.getIs_used())) {
-        return userDetail;
+            query.setIs_used(Boolean.parseBoolean(query.getIs_used())?"1":"0");
+        }
+        return sysUserMapper.getUserDetail(query, pageQuery);
     }
 
     @Override

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.fastjson.TypeReference;
-import com.alibaba.fastjson2.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.pdm.ivt.service.IstIvtCoolpointivtService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
+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;

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.fastjson.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;
@@ -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.IstIvtCoolpointivtService;
-import org.nl.wms.pdm.ivt.service.impl.StIvtCutpointivtServiceImpl;
+import org.nl.wms.pdm.ivt.service.IstIvtCoolregionioService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
+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;
 

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.fastjson.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;

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.fastjson.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;
@@ -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;
 
 

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.fastjson.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;

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

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}

nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999
     <contextName>nlAdmin</contextName>
     <property name="log.charset" value="utf-8"/>
     <property name="log.pattern"
-              value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %blue(%msg%n)"/>
+              value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %cyan(%msg%n)"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
     <!--<include resource="log/XrToMes.xml"/>

nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java

@@ -1,8 +1,8 @@
 package org.nl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson2.TypeReference;
+import com.alibaba.fastjson.TypeReference;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 

nladmin-ui/src/views/system/user/index.vue

@@ -681,7 +681,7 @@ export default {
         this.$nextTick(function() {
           for (let j = 0; j < row.roles.length; j++) {
             for (let i = 0; i < this.rolesDatas.length; i++) {
-              if (this.rolesDatas[i].roleId == row.roles[j].roleId) {
+              if (this.rolesDatas[i].role_id == row.roles[j].role_id) {
                 this.$refs.roleTable.toggleRowSelection(this.rolesDatas[i], true)
                 break
               }