From 4fb7e0400fcd65efb71e96d010efea286bf3e37c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 21 五月 2024 15:43:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/BasErrLogService.java | 2
src/main/java/com/zy/asrs/controller/SiteController.java | 6
src/main/java/com/zy/system/mapper/UserMapper.java | 2
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 2
src/main/java/com/zy/common/entity/Parameter.java | 4
src/main/java/com/zy/asrs/entity/BasCrnp.java | 20
src/main/java/com/zy/asrs/service/BasCrnpService.java | 2
src/main/java/com/zy/system/mapper/RoleMapper.java | 2
src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java | 2
src/main/java/com/zy/system/entity/UserLogin.java | 10
src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java | 8
src/main/java/com/zy/common/web/AuthController.java | 70 +-
src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java | 2
src/main/java/com/zy/system/service/impl/ApiServiceImpl.java | 2
src/main/java/com/zy/system/mapper/OperateLogMapper.java | 2
src/main/java/com/zy/system/entity/Api.java | 8
src/main/java/com/zy/system/service/UserLoginService.java | 2
src/main/java/com/zy/common/service/CommonService.java | 28
src/main/java/com/zy/system/mapper/HostMapper.java | 2
src/main/java/com/zy/system/mapper/UserLoginMapper.java | 2
src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java | 2
src/main/java/com/zy/system/controller/RoleController.java | 38 +-
src/main/java/com/zy/system/controller/UserController.java | 36 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 4
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 50 +-
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 6
src/main/java/com/zy/system/controller/HostController.java | 28
src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java | 3
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 12
src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java | 2
src/main/java/com/zy/asrs/mapper/MatCodeMapper.java | 2
src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java | 2
src/main/java/com/zy/asrs/entity/LocDetl.java | 12
src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java | 2
src/main/java/com/zy/asrs/service/StaDescService.java | 2
src/main/java/com/zy/system/entity/RoleResource.java | 8
src/main/java/com/zy/system/controller/UserLoginController.java | 28
src/main/java/com/zy/asrs/entity/BasDevp.java | 12
src/main/java/com/zy/asrs/entity/MatCode.java | 12
src/main/java/com/zy/common/web/BaseController.java | 2
src/main/java/com/zy/asrs/service/BasDevpService.java | 2
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 2
src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java | 2
src/main/java/com/zy/system/entity/Permission.java | 10
pom.xml | 6
src/main/java/com/zy/asrs/entity/BasErrLog.java | 12
src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java | 2
src/main/java/com/zy/system/mapper/ConfigMapper.java | 2
src/main/java/com/zy/asrs/entity/WrkLastno.java | 12
src/main/java/com/zy/system/entity/Config.java | 7
src/main/java/com/zy/asrs/service/RowLastnoService.java | 2
src/main/java/com/zy/system/service/OperateLogService.java | 2
src/main/java/com/zy/asrs/entity/BasCrnOpt.java | 10
src/main/java/com/zy/system/entity/Role.java | 9
src/main/java/com/zy/system/service/RoleService.java | 2
src/main/java/com/zy/asrs/entity/BasPlcerror.java | 12
src/main/java/com/zy/system/entity/OperateLog.java | 10
src/main/resources/mapper/WrkMastMapper.xml | 34
src/main/webapp/static/js/console.map.js | 2
src/main/java/com/zy/system/service/ApiService.java | 2
src/main/java/com/zy/asrs/controller/CrnController.java | 12
src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java | 2
src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java | 2
src/main/java/com/zy/system/service/RolePermissionService.java | 2
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6
src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java | 2
src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java | 2
src/main/java/com/zy/system/service/impl/HostServiceImpl.java | 2
src/main/java/com/zy/system/service/ResourceService.java | 2
src/main/resources/application.yml | 8
src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java | 2
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 2
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/system/entity/Resource.java | 10
src/main/java/com/zy/common/config/AdminInterceptor.java | 10
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 2
src/main/java/com/zy/system/service/UserService.java | 2
src/main/java/com/zy/system/entity/User.java | 12
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 12
src/main/java/com/zy/system/service/HostService.java | 2
src/main/java/com/zy/asrs/service/BasCrnOptService.java | 2
src/main/java/com/zy/system/service/impl/UserServiceImpl.java | 2
src/main/java/com/zy/system/controller/ConfigController.java | 28
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 10
src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java | 2
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/asrs/entity/LocMast.java | 12
src/main/java/com/zy/system/mapper/RoleResourceMapper.java | 2
src/main/java/com/zy/system/service/impl/RoleServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/BasCrnError.java | 12
src/main/java/com/zy/system/service/ConfigService.java | 2
src/main/java/com/zy/system/mapper/RolePermissionMapper.java | 2
src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java | 2
src/main/java/com/zy/system/controller/HomeController.java | 6
src/main/java/com/zy/system/controller/OperateLogController.java | 28
src/main/java/com/zy/asrs/service/MatCodeService.java | 2
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 8
src/main/java/com/zy/system/mapper/ResourceMapper.java | 2
src/main/java/com/zy/system/controller/ApiController.java | 28
src/main/java/com/zy/system/entity/Host.java | 8
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 4
src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java | 2
src/main/java/com/zy/system/controller/PermissionController.java | 28
src/main/java/com/zy/system/controller/ResourceController.java | 28
src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java | 2
src/main/java/com/zy/system/mapper/ApiMapper.java | 2
src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java | 2
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2
src/main/java/com/zy/system/service/PermissionService.java | 2
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4
src/main/java/com/zy/system/entity/RolePermission.java | 12
src/main/java/com/zy/asrs/mapper/StaDescMapper.java | 2
src/main/java/com/zy/asrs/entity/WrkMast.java | 22
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 12
src/main/java/com/zy/asrs/entity/RowLastno.java | 12
src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java | 2
src/main/java/com/zy/asrs/service/WrkLastnoService.java | 2
src/main/java/com/zy/system/mapper/PermissionMapper.java | 2
src/main/java/com/zy/asrs/controller/ConsoleController.java | 8
src/main/java/com/zy/system/service/RoleResourceService.java | 2
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 12
src/main/java/com/zy/asrs/service/LocMastService.java | 2
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/StaDesc.java | 21
128 files changed, 523 insertions(+), 519 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0b1c89..460bf00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,9 @@
<properties>
<java.version>1.8</java.version>
- <cool.version>3.4.0</cool.version>
+ <cool.version>3.4.5</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
- <mybatis-plus.version>2.3.2</mybatis-plus.version>
+ <mybatis-plus.version>3.4.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
<springfox.version>2.7.0</springfox.version>
</properties>
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>lktwcs</finalName>
+ <finalName>bjycwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index d2b5ed7..285ed9a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -142,7 +142,7 @@
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
} else {
@@ -208,7 +208,7 @@
if (null != devpThread) {
StaProtocol staProtocol = devpThread.getStation().get(siteId);
if (staProtocol != null) {
- BasDevp basDevp = basDevpService.selectById(siteId);
+ BasDevp basDevp = basDevpService.getById(siteId);
if (basDevp == null) {
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
@@ -216,7 +216,7 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
+ WrkMast wrkMast = wrkMastService.getById(staProtocol.getWorkNo());
if (wrkMast != null) {
vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
@@ -262,7 +262,7 @@
}
if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setSourceStaNo(wrkMast.getSourceStaNo$());
vo.setStaNo(wrkMast.getStaNo$());
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4d02d12..3cd023a 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,7 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -101,7 +101,7 @@
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable(){
List<CrnStateTableVo> list = new ArrayList<>();
- List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ List<BasCrnp> crnps = basCrnpService.list(new QueryWrapper<BasCrnp>().orderByAsc("crn_no"));
for (BasCrnp basCrnp : crnps) {
// 琛ㄦ牸琛�
CrnStateTableVo vo = new CrnStateTableVo();
@@ -139,7 +139,7 @@
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
List<CrnMsgTableVo> list = new ArrayList<>();
- List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
+ List<BasCrnp> crnps = basCrnpService.list(new QueryWrapper<BasCrnp>().orderByAsc("crn_no"));
for (BasCrnp basCrnp : crnps) {
// 琛ㄦ牸琛�
CrnMsgTableVo vo = new CrnMsgTableVo();
@@ -157,7 +157,7 @@
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastService.getById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
@@ -282,9 +282,9 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
+ LocMast sourceLoc = locMastService.getOne(new QueryWrapper<LocMast>().eq("row1", command.getSourcePosX())
.eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
- LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
+ LocMast loc = locMastService.getOne(new QueryWrapper<LocMast>().eq("row1", command.getDestinationPosX())
.eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
VersionUtils.locMoveCheckLocType(sourceLoc, loc);
return crnControl(command)?R.ok():R.error();
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index bbcb229..2b5502d 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,12 +1,13 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -15,7 +16,6 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.DevpThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -64,7 +64,7 @@
station.putAll(devpThread.getStation());
}
// 鎸佷箙鏁版嵁
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>().orderByAsc("dev_no"));
for (BasDevp devp : basDevps) {
SiteTableVo vo = new SiteTableVo();
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index 8702140..ec19fc7 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -102,7 +102,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -134,7 +134,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
index ed98925..9bbeb35 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -319,7 +319,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 2ce3c36..e53a38a 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasDevpService;
@@ -250,7 +250,7 @@
public String getFrmLocno$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.frmLocno);
+ LocMast locMast = service.getById(this.frmLocno);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -267,7 +267,7 @@
public String getFrmSta$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.frmSta);
+ BasDevp basDevp = service.getById(this.frmSta);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -284,7 +284,7 @@
public String getToSta$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.toSta);
+ BasDevp basDevp = service.getById(this.toSta);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -301,7 +301,7 @@
public String getToLocno$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.toLocno);
+ LocMast locMast = service.getById(this.toLocno);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -318,7 +318,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -350,7 +350,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 1e3d022..8272c61 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -266,7 +266,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -282,7 +282,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index f135e6b..4d74325 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -401,7 +401,7 @@
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
+ User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -433,7 +433,7 @@
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
+ User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
index f8f681e..9fdd8b6 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -118,7 +118,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -150,7 +150,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index 91fb456..d44482a 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -119,7 +119,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -151,7 +151,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index c02168d..1c06272 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -102,7 +102,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -134,7 +134,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 87c44d8..89db346 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -1,8 +1,10 @@
package com.zy.asrs.entity;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
@@ -156,7 +158,7 @@
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
+ LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -215,7 +217,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -231,7 +233,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd931b9..9e3b1f3 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -232,7 +232,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -248,7 +248,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index e6f8431..7ee4abf 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -523,7 +523,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -555,7 +555,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 07107cd..f9ca953 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -192,7 +192,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -224,7 +224,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index 9c61158..387da29 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnpService;
@@ -33,7 +33,6 @@
* 鍏ュ嚭搴撶被鍨�
*/
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableId(value = "type_no", type = IdType.INPUT)
@TableField("type_no")
private Integer typeNo;
@@ -48,7 +47,6 @@
* 浣滀笟绔欑偣
*/
@ApiModelProperty(value= "浣滀笟绔欑偣")
- @TableId(value = "stn_no", type = IdType.INPUT)
@TableField("stn_no")
private Integer stnNo;
@@ -63,7 +61,6 @@
* 鍫嗗灈鏈哄彿
*/
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableId(value = "crn_no", type = IdType.INPUT)
@TableField("crn_no")
private Integer crnNo;
@@ -162,7 +159,7 @@
public String getStnNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.stnNo);
+ BasDevp basDevp = service.getById(this.stnNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -187,7 +184,7 @@
public String getCrnNo$(){
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
+ BasCrnp basCrnp = service.getById(this.crnNo);
if (!Cools.isEmpty(basCrnp)){
return String.valueOf(basCrnp.getCrnNo());
}
@@ -204,7 +201,7 @@
public String getCrnStn$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.crnStn);
+ BasDevp basDevp = service.getById(this.crnStn);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -229,7 +226,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -261,7 +258,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index a18b5bf..2025f32 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,7 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 05c9703..fa39946 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -1,7 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -327,7 +329,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -343,7 +345,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 514079f..a2a9b44 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.User;
@@ -129,7 +129,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -161,7 +161,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e896efc..23cdf9d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
@@ -335,7 +335,7 @@
public String getCrnNo$(){
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
+ BasCrnp basCrnp = service.getById(this.crnNo);
if (!Cools.isEmpty(basCrnp)){
return String.valueOf(basCrnp.getCrnNo());
}
@@ -351,7 +351,7 @@
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
+ LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -360,7 +360,7 @@
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
+ BasDevp basDevp = service.getById(this.staNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -369,7 +369,7 @@
public String getSourceStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
+ BasDevp basDevp = service.getById(this.sourceStaNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -378,7 +378,7 @@
public String getSourceLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
+ LocMast locMast = service.getById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
@@ -429,7 +429,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -445,7 +445,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
index 5323679..378a5dc 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasCrnError;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
index 744c664..52a80f2 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasCrnOpt;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
index baffc35..ebabc1f 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasCrnp;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 668d2ca..7234755 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasDevp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
index cd49855..22396b2 100644
--- a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
@@ -1,8 +1,7 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.BasErrLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
index 93346b1..7d40881 100644
--- a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasPlcerror;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java b/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
index 50f490d..e73de4b 100644
--- a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasWrkIotype;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java b/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
index 7432bbc..9a7fb2a 100644
--- a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.BasWrkStatus;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index bc2cd84..4c17d26 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 9fd1d06..603b935 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.LocMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
index a09bd26..17bfdc4 100644
--- a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.MatCode;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java b/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
index bfb9079..d021e6f 100644
--- a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.RowLastno;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
index 1518045..cc062c0 100644
--- a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.StaDesc;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
index cbca94b..62e573a 100644
--- a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WaitPakin;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 3ff2711..d72c6d4 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkDetl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java b/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
index ebeb20f..a3c4948 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkLastno;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 7386c18..81e8171 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -30,11 +30,11 @@
WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
// 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
+// @Select("select top 1 * from asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
// 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
-// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
+// @Select("select top 1 from asr_wrk_mast where wrk_no=#{workNo}")
WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
@@ -42,15 +42,15 @@
WrkMast selectPickStep(@Param("barcode")String barcode);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
-// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
+// @Select("select top 1 * from asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
WrkMast selectPakOutStep1(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
-// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
+// @Select("select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
// 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
-// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
+// @Select("select top 1 * from asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/BasCrnOptService.java b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
index 7538c73..a33d5c6 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasCrnOpt;
-import com.baomidou.mybatisplus.service.IService;
public interface BasCrnOptService extends IService<BasCrnOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/asrs/service/BasCrnpService.java
index 10c3feb..c6b2e3d 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnpService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasCrnp;
public interface BasCrnpService extends IService<BasCrnp> {
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 8628feb..5e8533d 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.BasDevp;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/BasErrLogService.java b/src/main/java/com/zy/asrs/service/BasErrLogService.java
index 3c335c1..8cc4507 100644
--- a/src/main/java/com/zy/asrs/service/BasErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasErrLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasErrLog;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
public interface BasErrLogService extends IService<BasErrLog> {
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 737a98c..8e06597 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.LocDetl;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index bc45966..1066cfb 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.LocMast;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/MatCodeService.java b/src/main/java/com/zy/asrs/service/MatCodeService.java
index 0f78ed5..5718eb0 100644
--- a/src/main/java/com/zy/asrs/service/MatCodeService.java
+++ b/src/main/java/com/zy/asrs/service/MatCodeService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.MatCode;
public interface MatCodeService extends IService<MatCode> {
diff --git a/src/main/java/com/zy/asrs/service/RowLastnoService.java b/src/main/java/com/zy/asrs/service/RowLastnoService.java
index dca50fd..a836504 100644
--- a/src/main/java/com/zy/asrs/service/RowLastnoService.java
+++ b/src/main/java/com/zy/asrs/service/RowLastnoService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.RowLastno;
public interface RowLastnoService extends IService<RowLastno> {
diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/asrs/service/StaDescService.java
index b0ea462..99c0246 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/asrs/service/StaDescService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.StaDesc;
public interface StaDescService extends IService<StaDesc> {
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 18f7637..58bb1c0 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
diff --git a/src/main/java/com/zy/asrs/service/WrkLastnoService.java b/src/main/java/com/zy/asrs/service/WrkLastnoService.java
index c3c2df8..2a9d68a 100644
--- a/src/main/java/com/zy/asrs/service/WrkLastnoService.java
+++ b/src/main/java/com/zy/asrs/service/WrkLastnoService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.WrkLastno;
public interface WrkLastnoService extends IService<WrkLastno> {
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 67469f8..79f4568 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.entity.WrkMast;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
index 299afa8..da97731 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.mapper.BasCrnOptMapper;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.service.BasCrnOptService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basCrnOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index 3446c77..2ba7ac5 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
@@ -16,7 +16,7 @@
@Override
public BasCrnp checkSiteStatus(Integer crnId) {
- BasCrnp crnp = this.selectById(crnId);
+ BasCrnp crnp = this.baseMapper.selectById(crnId);
if (Cools.isEmpty(crnp)) {
throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
}
@@ -31,7 +31,7 @@
@Override
public boolean checkSiteError(Integer crnNo, boolean pakin) {
- BasCrnp crnp = this.selectById(crnNo);
+ BasCrnp crnp = this.baseMapper.selectById(crnNo);
if (Cools.isEmpty(crnp)) {
News.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
return false;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 1f87a7d..dd3b14d 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasDevpMapper;
@@ -44,7 +44,7 @@
@Override
public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
- BasDevp station = selectById(devpNo);
+ BasDevp station = this.baseMapper.selectById(devpNo);
if (station == null){
throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
index 817212c..0491b27 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.mapper.BasErrLogMapper;
import com.zy.asrs.entity.BasErrLog;
import com.zy.asrs.service.BasErrLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -14,7 +14,7 @@
@Override
public BasErrLog findLatestByTaskNo(Integer crnNo, Integer taskNo) {
- List<BasErrLog> basErrLogs = this.baseMapper.selectList(new EntityWrapper<BasErrLog>().eq("crn_no", crnNo).eq("wrk_no", taskNo).orderBy("start_time", false));
+ List<BasErrLog> basErrLogs = this.baseMapper.selectList(new QueryWrapper<BasErrLog>().eq("crn_no", crnNo).eq("wrk_no", taskNo).orderByDesc("start_time"));
if (basErrLogs == null || basErrLogs.size() == 0) {
return null;
} else {
@@ -24,7 +24,7 @@
@Override
public BasErrLog findLatest(Integer crnNo) {
- List<BasErrLog> basErrLogs = this.baseMapper.selectList(new EntityWrapper<BasErrLog>().eq("crn_no", crnNo).orderBy("start_time", false));
+ List<BasErrLog> basErrLogs = this.baseMapper.selectList(new QueryWrapper<BasErrLog>().eq("crn_no", crnNo).orderByDesc("start_time"));
if (basErrLogs == null || basErrLogs.size() == 0) {
return null;
} else {
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 57f3645..0279886 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,8 +1,8 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
@@ -15,15 +15,15 @@
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+// page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
+// page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
return page;
}
@Override
public boolean updateAnfme(Double anfme, String locNo, String matnr) {
if (anfme <= 0) {
- return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+ return remove(new QueryWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
} else {
int res = baseMapper.updateAnfme(anfme, locNo, matnr);
return res > 0;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ababf93..e544373 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
@@ -27,7 +27,7 @@
if (Cools.isEmpty(sourceLocNo)) {
return null;
}
- LocMast sourceStock = this.selectById(sourceLocNo);
+ LocMast sourceStock = this.baseMapper.selectById(sourceLocNo);
if (Cools.isEmpty(sourceStock)) {
return null;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a60bbd1..f9dced6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2,8 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
@@ -410,11 +410,11 @@
// log.error("{}鍙蜂换鍔℃暟鎹紓甯革紒", wrkMast.getWrkNo());
// }
// 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ Wrapper<StaDesc> wrapper = new QueryWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
.eq("stn_no", pickSta.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
- StaDesc staDesc = staDescService.selectOne(wrapper);
+ StaDesc staDesc = staDescService.getOne(wrapper);
if (Cools.isEmpty(staDesc)) {
News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
staProtocol.setWorkNo((short) 9989);
@@ -459,7 +459,7 @@
// 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
locMast.setLocSts("Q");
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
@@ -575,7 +575,7 @@
if (crnProtocol == null) {
continue;
}
- BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ BasCrnp basCrnp = basCrnpService.getById(crn.getId());
if (basCrnp == null) {
News.error(""+mark+" - 1"+" - {}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
continue;
@@ -695,7 +695,7 @@
staProtocol = staProtocol.clone();
}
// 鏌ヨ绔欑偣璇︾粏淇℃伅
- BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ BasDevp staDetl = basDevpService.getById(crnStn.getStaNo());
if (staDetl == null) {
News.error(""+mark+" - 1"+" - 2"+" - 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
continue;
@@ -719,7 +719,7 @@
continue;
}
// 鑾峰彇搴撲綅淇℃伅
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.getById(wrkMast.getLocNo());
if (locMast == null) {
News.error(""+mark+" - 1"+" - 5"+" - 鏌ヨ搴撳瓨鏃犳暟鎹�--搴撲綅鍙穥}", wrkMast.getLocNo());
continue;
@@ -744,7 +744,7 @@
if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
News.warnNoLog(""+mark+" - 1"+" - 8"+" - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}",wrkMast.getWrkNo());
String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ LocMast shallowLoc = locMastService.getById(shallowLocNo);
// O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
News.warnNoLog(""+mark+" - 1"+" - 9"+" - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}",shallowLoc.getLocSts());
@@ -847,7 +847,7 @@
continue;
}
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceSta = locMastService.getById(wrkMast.getSourceLocNo());
if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
News.error(""+mark+" - 2"+" - 2"+" - 鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
continue;
@@ -871,7 +871,7 @@
// }
// 鏌ヨ绔欑偣璇︾粏淇℃伅
- BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ BasDevp staDetl = basDevpService.getById(crnStn.getStaNo());
if (staDetl == null) {
News.error(""+mark+" - 2"+" - 5"+" - 鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
break;
@@ -892,7 +892,7 @@
if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
News.warnNoLog(""+mark+" - 2"+" - 6"+" - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}",wrkMast.getWrkNo());
String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ LocMast shallowLoc = locMastService.getById(shallowLocNo);
// O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒
if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
News.warnNoLog(""+mark+" - 2"+" - 7"+" - // O.绌哄簱浣嶃�丵.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}",shallowLoc.getLocSts());
@@ -1106,7 +1106,7 @@
}
News.warnNoLog(""+mark+" - 3"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽簱浣嶇Щ杞�");
// 鑾峰彇婧愬簱浣嶄俊鎭�
- LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
+ LocMast sourceSta = locMastService.getById(wrkMast.getSourceLocNo());
if (null == sourceSta) {
News.error(""+mark+" - 3"+" - 1"+" - 宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈡簮搴撲綅澶辫触锛佸伐浣滃彿={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
return;
@@ -1116,13 +1116,13 @@
return;
}
// 鑾峰彇鐩爣搴撲綅淇℃伅
- LocMast sta = locMastService.selectById(wrkMast.getLocNo());
+ LocMast sta = locMastService.getById(wrkMast.getLocNo());
if (null == sta) {
News.error(""+mark+" - 3"+" - 2"+" - 宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈢洰鏍囧簱浣嶅け璐ワ紒宸ヤ綔鍙�={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
return;
}
// 鑾峰彇鍫嗗灈鏈轰俊鎭� 骞� 鍒ゆ柇鏄惁鍙叆鍑�
- BasCrnp basCrnp = basCrnpService.selectById(slave.getId());
+ BasCrnp basCrnp = basCrnpService.getById(slave.getId());
if (!basCrnp.getInEnable().equals("Y") && !basCrnp.getOutEnable().equals("Y")) {
return;
}
@@ -1267,7 +1267,7 @@
null, // 淇敼浜哄憳
"浠诲姟涓紓甯�" // 澶囨敞
);
- if (!basErrLogService.insert(basErrLog)) {
+ if (!basErrLogService.save(basErrLog)) {
News.error(""+mark+" - 2"+" - 鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
}
}
@@ -1315,7 +1315,7 @@
null, // 淇敼浜哄憳
"鏃犱换鍔″紓甯�" // 澶囨敞
);
- if (!basErrLogService.insert(basErrLog)) {
+ if (!basErrLogService.save(basErrLog)) {
News.error(""+mark+" - 5"+" - 鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
}
}
@@ -1622,7 +1622,7 @@
*/
@Transactional
public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast) {
- LocMast loc = locMastService.selectById(pakinWrkMast.getLocNo());
+ LocMast loc = locMastService.getById(pakinWrkMast.getLocNo());
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(0);
@@ -1652,7 +1652,7 @@
}
// 宸ヤ綔妗ｆ槑缁嗕繚瀛�
if (shallowLoc.getLocSts().equals("F")) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+ List<LocDetl> locDetls = locDetlService.list(new QueryWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
for (LocDetl locDetl : locDetls) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
@@ -1661,7 +1661,7 @@
VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
+ if (!wrkDetlService.save(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
}
@@ -1709,7 +1709,7 @@
if (loc != null) {
if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
- LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
+ LocMast shallowLoc1 = locMastService.getById(shallowLocNo);
if (!shallowLoc1.getLocSts().equals("O")) {
loc = null;
}
@@ -1727,7 +1727,7 @@
if (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱
String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
- LocMast deepLoc1 = locMastService.selectById(deepLoc);
+ LocMast deepLoc1 = locMastService.getById(deepLoc);
if (!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("D")) {
loc = null;
}
@@ -1772,7 +1772,7 @@
}
// 宸ヤ綔妗ｆ槑缁嗕繚瀛�
if (shallowLoc.getLocSts().equals("F")) {
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+ List<LocDetl> locDetls = locDetlService.list(new QueryWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
for (LocDetl locDetl : locDetls) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
@@ -1781,7 +1781,7 @@
VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiTime(new Date());
- if (!wrkDetlService.insert(wrkDetl)) {
+ if (!wrkDetlService.save(wrkDetl)) {
News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 3"+" - 淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -2039,7 +2039,7 @@
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛宱utOfDevp");
}
for (WrkMast wrkMast : wrkMasts) {
- if (basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) {
+ if (basDevpService.count(new QueryWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) {
wrkMast.setCtnNo("Y");
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error(""+mark+" - 1"+" - 淇敼{}宸ヤ綔妗ｅけ璐ワ紝ctn_no", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
index 72ae4e0..06d50cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.mapper.MatCodeMapper;
import com.zy.asrs.service.MatCodeService;
diff --git a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
index 1a32cff..f419c58 100644
--- a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.mapper.RowLastnoMapper;
import com.zy.asrs.service.RowLastnoService;
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 87a3f20..4217bad 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.StaDescMapper;
import com.zy.asrs.service.StaDescService;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 017911a..7dbafc6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
@@ -30,7 +30,7 @@
return;
}
for (WaitPakin waitPakin : waitPakins) {
- MatCode matCode = matCodeService.selectById(waitPakin.getMatnr());
+ MatCode matCode = matCodeService.getById(waitPakin.getMatnr());
if (Cools.isEmpty(matCode)){
throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
}
@@ -42,7 +42,7 @@
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiTime(new Date());
- if (!this.insert(wrkDetl)) {
+ if (!this.save(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
index f069f52..2a5a4a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.mapper.WrkLastnoMapper;
import com.zy.asrs.service.WrkLastnoService;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 8c0b9e9..78a8b54 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
@@ -14,7 +14,7 @@
@Override
public int getWorkingMast(Integer devpNo) {
- return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
+ return this.baseMapper.selectCount(new QueryWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6));
}
@Override
@@ -29,6 +29,6 @@
@Override
public int getOutToStn182(Integer devpNo) {
- return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
+ return this.baseMapper.selectCount(new QueryWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
}
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 04ca10f..d10f2b8 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -1,6 +1,6 @@
package com.zy.common.config;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -90,12 +90,12 @@
private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
- UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
+ UserLogin userLogin = userLoginService.getOne(new QueryWrapper<UserLogin>().eq("token", token));
if (null == userLogin){
Http.response(response, BaseRes.DENIED);
return false;
}
- User user = userService.selectById(userLogin.getUserId());
+ User user = userService.getById(userLogin.getUserId());
String deToken = Cools.deTokn(token, user.getPassword());
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
@@ -133,9 +133,9 @@
Permission permission = new Permission();
permission.setAction(action);
permission.setStatus((short) 1);
- Permission one = permissionService.selectOne(new EntityWrapper<>(permission));
+ Permission one = permissionService.getOne(new QueryWrapper<>(permission));
if (!Cools.isEmpty(one)) {
- RolePermission rolePermission = rolePermissionService.selectOne(new EntityWrapper<>(new RolePermission(user.getRoleId(), permission.getId())));
+ RolePermission rolePermission = rolePermissionService.getById(new QueryWrapper<>(new RolePermission(user.getRoleId(), permission.getId())));
return !Cools.isEmpty(rolePermission);
}
return true;
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 548158f..c00e09f 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -1,7 +1,7 @@
package com.zy.common.entity;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.entity.Config;
@@ -36,7 +36,7 @@
*/
public static Parameter reset() {
ConfigService configService = SpringUtils.getBean(ConfigService.class);
- List<Config> configs = configService.selectList(new EntityWrapper<Config>().eq("status", "1"));
+ List<Config> configs = configService.list(new QueryWrapper<Config>().eq("status", "1"));
Map<String, Object> data = new HashMap<>();
for (Config config : configs) {
if (config.getType() == 1) {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fa0d583..4f8c73e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,8 +1,8 @@
package com.zy.common.service;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -54,7 +54,7 @@
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
- WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
+ WrkLastno wrkLastno = wrkLastnoService.getById(wrkMk);
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
@@ -64,7 +64,7 @@
int eNo = wrkLastno.getENo();
workNo = workNo>=eNo ? sNo : workNo+1;
while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.getById(workNo);
if (null != wrkMast) {
workNo = workNo>=eNo ? sNo : workNo+1;
} else {
@@ -80,7 +80,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.getById(workNo)!=null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -121,7 +121,7 @@
default:
throw new CoolException("搴撲綅鎺掑彿鍒嗛厤閿欒, 婧愮珯鍙凤細" + sourceStaNo);
}
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ RowLastno rowLastno = rowLastnoService.getById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
@@ -146,7 +146,7 @@
}
String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ LocMast shallowLoc = locMastService.getById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
@@ -161,7 +161,7 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ List<LocMast> locMasts = locMastService.list(new QueryWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -169,7 +169,7 @@
}
String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ LocMast shallowLoc = locMastService.getById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
locMast = shallowLoc;
@@ -235,16 +235,16 @@
throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
}
// 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ Wrapper<StaDesc> wrapper = new QueryWrapper<StaDesc>()
.eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
.eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
+ StaDesc staDesc = staDescService.getOne(wrapper);
if (Cools.isEmpty(staDesc)) {
News.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ BasDevp staNo = basDevpService.getById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
@@ -272,14 +272,14 @@
}
// 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
+ LocMast deepLoc = locMastService.getById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
locMast = null;
}
}
// 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
+ LocMast shallowLoc = locMastService.getById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
if (!shallowLoc.getLocSts().equals("O")) {
locMast = null;
}
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index badc290..1dbb2e1 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -1,8 +1,8 @@
package com.zy.common.web;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -56,9 +56,9 @@
res.put("token", Cools.enToken(System.currentTimeMillis() + mobile, superPwd));
return R.ok(res);
}
- EntityWrapper<User> userWrapper = new EntityWrapper<>();
+ QueryWrapper<User> userWrapper = new QueryWrapper<>();
userWrapper.eq("mobile", mobile);
- User user = userService.selectOne(userWrapper);
+ User user = userService.getOne(userWrapper);
if (Cools.isEmpty(user)){
return R.parse(CodeRes.USER_10001);
}
@@ -69,11 +69,11 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + mobile, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", user.getId()));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
res.put("token", token);
@@ -110,30 +110,30 @@
@RequestMapping("/user/detail/auth")
@ManagerAuth
public R userDetail(){
- return R.ok(userService.selectById(getUserId()));
+ return R.ok(userService.getById(getUserId()));
}
@RequestMapping("/menu/auth")
@ManagerAuth(memo = "棣栭〉鑿滃崟")
public R menu(){
// 鑾峰彇鎵�鏈変竴绾ц彍鍗�
- List<Resource> oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ List<Resource> oneLevel = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderByAsc("sort"));
User user = null;
Wrapper<Resource> resourceWrapper;
if (getUserId() == 9527) {
- resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
+ resourceWrapper = new QueryWrapper<Resource>().eq("level", 2).eq("status", 1).orderByAsc("sort");
} else {
// 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
- user = userService.selectById(getUserId());
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
+ user = userService.getById(getUserId());
+ List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", user.getRoleId()));
List<Long> resourceIds = new ArrayList<>();
roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
if (resourceIds.isEmpty()){
return R.ok();
}
- resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
+ resourceWrapper = new QueryWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderByAsc("sort");
}
- List<Resource> twoLevel = resourceService.selectList(resourceWrapper);
+ List<Resource> twoLevel = resourceService.list(resourceWrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Resource menu : oneLevel) {
Map<String, Object> map = new HashMap<>();
@@ -145,12 +145,12 @@
// 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
if (getUserId() != 9527) {
- Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
+ Resource view = resourceService.getOne(new QueryWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
if (!Cools.isEmpty(view)){
RoleResource param = new RoleResource();
param.setResourceId(view.getId());
param.setRoleId(user.getRoleId());
- if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
+ if (null == roleResourceService.getOne(new QueryWrapper<>(param))){
continue;
}
}
@@ -175,7 +175,7 @@
@RequestMapping("/power/list/auth")
@ManagerAuth
public R powerList(){
- List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ List<Resource> oneLevels = resourceService.list(new QueryWrapper<Resource>().eq("level", 1).eq("status", 1).orderByAsc("sort"));
List<Map> result = new ArrayList<>();
// 涓�绾�
for (Resource oneLevel : oneLevels){
@@ -185,7 +185,7 @@
oneLevelMap.put("id", oneLevel.getId());
oneLevelMap.put("spread", true);
oneLevelMap.put("children", twoLevelsList);
- List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
+ List<Resource> twoLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderByAsc("sort"));
// 浜岀骇
for (Resource twoLevel : twoLevels){
Map<String, Object> twoLevelMap = new HashMap<>();
@@ -196,7 +196,7 @@
List<Map> threeLevelsList = new ArrayList<>();
twoLevelMap.put("children", threeLevelsList);
// 涓夌骇
- List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
+ List<Resource> threeLevels = resourceService.list(new QueryWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderByAsc("sort"));
for (Resource threeLevel : threeLevels){
Map<String, Object> threeLevelMap = new HashMap<>();
threeLevelMap.put("title", threeLevel.getName());
@@ -217,7 +217,7 @@
functions.put("spread", true);
List<Map> funcs = new ArrayList<>();
functions.put("children", funcs);
- List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
+ List<Permission> permissions = permissionService.list(new QueryWrapper<Permission>().eq("status", 1));
for (Permission permission : permissions) {
Map<String, Object> func = new HashMap<>();
func.put("title", permission.getName());
@@ -235,9 +235,9 @@
public R get(@PathVariable("roleId") Long roleId) {
List<Object> result = new ArrayList<>();
// 鑿滃崟
- List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
+ List<RoleResource> roleResources = roleResourceService.list(new QueryWrapper<RoleResource>().eq("role_id", roleId));
for (RoleResource roleResource : roleResources){
- Resource resource = resourceService.selectById(roleResource.getResourceId());
+ Resource resource = resourceService.getById(roleResource.getResourceId());
if (!Cools.isEmpty(resource)){
if (resource.getLevel() == 3){
result.add(resource.getId());
@@ -245,9 +245,9 @@
}
}
// 鍔熻兘
- List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ List<RolePermission> rolePermissions = rolePermissionService.list(new QueryWrapper<RolePermission>().eq("role_id", roleId));
for (RolePermission rolePermission : rolePermissions){
- Permission permission = permissionService.selectById(rolePermission.getPermissionId());
+ Permission permission = permissionService.getById(rolePermission.getPermissionId());
if (!Cools.isEmpty(permission)){
result.add(permission.getAction());
}
@@ -259,18 +259,18 @@
@ManagerAuth(memo = "鎺堟潈")
@Transactional
public R power(Long roleId, String powers){
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
- roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
- rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ roleResourceService.remove(new QueryWrapper<RoleResource>().eq("role_id", roleId));
+ rolePermissionService.remove(new QueryWrapper<RolePermission>().eq("role_id", roleId));
if (!Cools.isEmpty(powers)){
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
- Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
+ Resource resource = resourceService.getOne(new QueryWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
if (!Cools.isEmpty(resource)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
@@ -278,22 +278,22 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
} else {
- Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
+ Permission permission = permissionService.getOne(new QueryWrapper<Permission>().eq("action", dto.getTwo()));
if (!Cools.isEmpty(permission)){
RolePermission rolePermission = new RolePermission();
rolePermission.setRoleId(roleId);
rolePermission.setPermissionId(permission.getId());
- rolePermissionService.insert(rolePermission);
+ rolePermissionService.save(rolePermission);
}
}
for (String three : dto.getThree()){
- Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
+ Resource resource1 = resourceService.getOne(new QueryWrapper<Resource>().eq("id", three).eq("level", 3));
if (!Cools.isEmpty(resource1)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+ RoleResource roleResource = roleResourceService.getOne(new QueryWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
if (null == roleResource) {
throw new CoolException(resource.getName().concat("鐨�").concat(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())));
}
@@ -301,7 +301,7 @@
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
roleResource.setResourceId(resource1.getId());
- roleResourceService.insert(roleResource);
+ roleResourceService.save(roleResource);
}
}
}
@@ -314,7 +314,7 @@
public R buttonResource(@PathVariable("resourceId") Long resourceId) {
List<Resource> resources;
if (getUserId() == 9527) {
- resources = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
+ resources = resourceService.list(new QueryWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId));
} else {
resources = roleResourceService.getMenuButtomResource(resourceId, getUserId());
}
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 80596c9..f65ea3b 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -27,7 +27,7 @@
}
protected User getUser(){
- User user = userService.selectById(getUserId());
+ User user = userService.getById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
}
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index fb24a86..0310a88 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -326,7 +326,7 @@
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
);
- bean.insert(basCrnOpt);
+ bean.save(basCrnOpt);
} catch (Exception ignore) {}
if (result != null && result.IsSuccess) {
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ac81663..2c9e8f3 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -277,7 +277,7 @@
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
);
- bean.insert(basCrnOpt);
+ bean.save(basCrnOpt);
} catch (Exception ignore) {}
if (result != null && result.IsSuccess) {
diff --git a/src/main/java/com/zy/system/controller/ApiController.java b/src/main/java/com/zy/system/controller/ApiController.java
index 126983d..3be04dc 100644
--- a/src/main/java/com/zy/system/controller/ApiController.java
+++ b/src/main/java/com/zy/system/controller/ApiController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/api/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(apiService.selectById(String.valueOf(id)));
+ return R.ok(apiService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/api/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Api> wrapper = new EntityWrapper<>();
+ QueryWrapper<Api> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(apiService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(apiService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == api.getId()){
- apiService.insert(api);
+ apiService.save(api);
} else {
apiService.updateById(api);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/api/add/auth")
@ManagerAuth
public R add(Api api) {
- apiService.insert(api);
+ apiService.save(api);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- apiService.deleteBatchIds(Arrays.asList(ids));
+ apiService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Api> wrapper = new EntityWrapper<>();
+ QueryWrapper<Api> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("api"));
convert(map, wrapper);
- List<Api> list = apiService.selectList(wrapper);
+ List<Api> list = apiService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/apiQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Api> wrapper = new EntityWrapper<>();
+ QueryWrapper<Api> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<Api> page = apiService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Api> page = apiService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Api api : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index a005512..6358332 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -2,8 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -26,7 +26,7 @@
@RequestMapping(value = "/config/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(configService.selectById(String.valueOf(id)));
+ return R.ok(configService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/config/list/auth")
@@ -37,13 +37,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(configService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -67,7 +67,7 @@
}
}
if (null == config.getId()){
- configService.insert(config);
+ configService.save(config);
} else {
configService.updateById(config);
Parameter.reset();
@@ -83,7 +83,7 @@
return R.error("json瑙ｆ瀽澶辫触");
}
}
- configService.insert(config);
+ configService.save(config);
return R.ok();
}
@@ -109,7 +109,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- configService.deleteBatchIds(Arrays.asList(ids));
+ configService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -117,19 +117,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("config"));
convert(map, wrapper);
- List<Config> list = configService.selectList(wrapper);
+ List<Config> list = configService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/configQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<Config> page = configService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Config> page = configService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Config config : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/HomeController.java b/src/main/java/com/zy/system/controller/HomeController.java
index 6568c90..2521158 100644
--- a/src/main/java/com/zy/system/controller/HomeController.java
+++ b/src/main/java/com/zy/system/controller/HomeController.java
@@ -1,6 +1,6 @@
package com.zy.system.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.R;
@@ -31,9 +31,9 @@
@RequestMapping("/top")
@ManagerAuth
public R top(){
- int logTotal = operateLogService.selectCount(new EntityWrapper<>());
+ int logTotal = operateLogService.count(new QueryWrapper<>());
int logWeek = operateLogService.selectCountByCurrentWeek();
- int userTotal = userService.selectCount(new EntityWrapper<>());
+ int userTotal = userService.count(new QueryWrapper<>());
int loginWeek = userLoginService.selectCountByCurrentWeek();
Map<String, Object> result = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/HostController.java b/src/main/java/com/zy/system/controller/HostController.java
index bad930a..e754b80 100644
--- a/src/main/java/com/zy/system/controller/HostController.java
+++ b/src/main/java/com/zy/system/controller/HostController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/host/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(hostService.selectById(String.valueOf(id)));
+ return R.ok(hostService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/host/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Host> wrapper = new EntityWrapper<>();
+ QueryWrapper<Host> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(hostService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(hostService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == host.getId()){
- hostService.insert(host);
+ hostService.save(host);
} else {
hostService.updateById(host);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/host/add/auth")
@ManagerAuth
public R add(Host host) {
- hostService.insert(host);
+ hostService.save(host);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- hostService.deleteBatchIds(Arrays.asList(ids));
+ hostService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Host> wrapper = new EntityWrapper<>();
+ QueryWrapper<Host> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("host"));
convert(map, wrapper);
- List<Host> list = hostService.selectList(wrapper);
+ List<Host> list = hostService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/hostQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Host> wrapper = new EntityWrapper<>();
+ QueryWrapper<Host> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Host> page = hostService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Host> page = hostService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Host host : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index da7f7b1..9ceccd0 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/operateLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(operateLogService.selectById(String.valueOf(id)));
+ return R.ok(operateLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/operateLog/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(operateLogService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == operateLog.getId()){
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
} else {
operateLogService.updateById(operateLog);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/operateLog/add/auth")
@ManagerAuth
public R add(OperateLog operateLog) {
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- operateLogService.deleteBatchIds(Arrays.asList(ids));
+ operateLogService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("operateLog"));
convert(map, wrapper);
- List<OperateLog> list = operateLogService.selectList(wrapper);
+ List<OperateLog> list = operateLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/operateLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<OperateLog> page = operateLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OperateLog> page = operateLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (OperateLog operateLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index c943808..7365510 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/permission/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(permissionService.selectById(String.valueOf(id)));
+ return R.ok(permissionService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/permission/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(permissionService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(permissionService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == permission.getId()){
- permissionService.insert(permission);
+ permissionService.save(permission);
} else {
permissionService.updateById(permission);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/permission/add/auth")
@ManagerAuth
public R add(Permission permission) {
- permissionService.insert(permission);
+ permissionService.save(permission);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- permissionService.deleteBatchIds(Arrays.asList(ids));
+ permissionService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("permission"));
convert(map, wrapper);
- List<Permission> list = permissionService.selectList(wrapper);
+ List<Permission> list = permissionService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/permissionQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Permission> page = permissionService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Permission> page = permissionService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Permission permission : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index aded982..efe787b 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/resource/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(resourceService.selectById(String.valueOf(id)));
+ return R.ok(resourceService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/resource/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(resourceService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -63,7 +63,7 @@
if (resource.getSort() == null){
resource.setSort(999);
}
- resourceService.insert(resource);
+ resourceService.save(resource);
} else {
resourceService.updateById(resource);
}
@@ -73,7 +73,7 @@
@RequestMapping(value = "/resource/add/auth")
@ManagerAuth(memo = "鑿滃崟娣诲姞")
public R add(Resource resource) {
- resourceService.insert(resource);
+ resourceService.save(resource);
return R.ok();
}
@@ -93,7 +93,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- resourceService.deleteBatchIds(Arrays.asList(ids));
+ resourceService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -101,19 +101,19 @@
@ManagerAuth(memo = "鑿滃崟瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("resource"));
convert(map, wrapper);
- List<Resource> list = resourceService.selectList(wrapper);
+ List<Resource> list = resourceService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/resourceQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+ QueryWrapper<Resource> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Resource> page = resourceService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Resource> page = resourceService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Resource resource : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..ccea140 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/role/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(roleService.selectById(String.valueOf(id)));
+ return R.ok(roleService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/role/list/auth")
@@ -35,21 +35,21 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Role> wrapper = new EntityWrapper<>();
+ QueryWrapper<Role> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
+ wrapper.orderByDesc("id");
if (9527 == getUserId()) {
- return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
}
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
leaderIds.add(roleId);
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
@@ -58,10 +58,10 @@
// if (null != role.getLevel()) {
// wrapper.gt("level", role.getLevel());
// }
- return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -80,7 +80,7 @@
return R.error();
}
if (null == role.getId()){
- roleService.insert(role);
+ roleService.save(role);
} else {
roleService.updateById(role);
}
@@ -90,7 +90,7 @@
@RequestMapping(value = "/role/add/auth")
@ManagerAuth(memo = "瑙掕壊娣诲姞")
public R add(Role role) {
- roleService.insert(role);
+ roleService.save(role);
return R.ok();
}
@@ -110,7 +110,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- roleService.deleteBatchIds(Arrays.asList(ids));
+ roleService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -118,27 +118,27 @@
@ManagerAuth(memo = "瑙掕壊瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Role> wrapper = new EntityWrapper<>();
+ QueryWrapper<Role> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
convert(map, wrapper);
- List<Role> list = roleService.selectList(wrapper);
+ List<Role> list = roleService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/roleQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Role> wrapper = new EntityWrapper<>();
+ QueryWrapper<Role> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
// 涓婁笅绾х鐞�
if (9527 != getUserId()) {
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
@@ -149,7 +149,7 @@
// }
}
- Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Role> page = roleService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Role role : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index f3ec1c2..74fc93f 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -28,7 +28,7 @@
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(userService.selectById(String.valueOf(id)));
+ return R.ok(userService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/user/list/auth")
@@ -39,31 +39,31 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
+ wrapper.orderByDesc("id");
if (9527 == getUserId()) {
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(userService.page(new Page<>(curr, limit), wrapper));
}
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
leaderIds.add(role.getId());
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
wrapper.notIn("role_id", leaderIds);
}
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(userService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -82,7 +82,7 @@
return R.error();
}
if (null == user.getId()){
- userService.insert(user);
+ userService.save(user);
} else {
userService.updateById(user);
}
@@ -92,7 +92,7 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
- userService.insert(user);
+ userService.save(user);
return R.ok();
}
@@ -102,7 +102,7 @@
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
}
- User entity = userService.selectById(user.getId());
+ User entity = userService.getById(user.getId());
if (user.getPassword()!=null) {
entity.setPassword(user.getPassword());
}
@@ -122,7 +122,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- userService.deleteBatchIds(Arrays.asList(ids));
+ userService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -130,19 +130,19 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
convert(map, wrapper);
- List<User> list = userService.selectList(wrapper);
+ List<User> list = userService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/userQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.like("username", condition);
- Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
+ Page<User> page = userService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (User user : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 69960f1..43d9403 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/userLogin/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(userLoginService.selectById(String.valueOf(id)));
+ return R.ok(userLoginService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/userLogin/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
+ QueryWrapper<UserLogin> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(userLoginService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(userLoginService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == userLogin.getId()){
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
} else {
userLoginService.updateById(userLogin);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/userLogin/add/auth")
@ManagerAuth
public R add(UserLogin userLogin) {
- userLoginService.insert(userLogin);
+ userLoginService.save(userLogin);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- userLoginService.deleteBatchIds(Arrays.asList(ids));
+ userLoginService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
+ QueryWrapper<UserLogin> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("userLogin"));
convert(map, wrapper);
- List<UserLogin> list = userLoginService.selectList(wrapper);
+ List<UserLogin> list = userLoginService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/userLoginQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
+ QueryWrapper<UserLogin> wrapper = new QueryWrapper<>();
wrapper.like("token", condition);
- Page<UserLogin> page = userLoginService.selectPage(new Page<>(0, 10), wrapper);
+ Page<UserLogin> page = userLoginService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (UserLogin userLogin : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/system/entity/Api.java b/src/main/java/com/zy/system/entity/Api.java
index 9342543..258f94e 100644
--- a/src/main/java/com/zy/system/entity/Api.java
+++ b/src/main/java/com/zy/system/entity/Api.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/Config.java b/src/main/java/com/zy/system/entity/Config.java
index 9b6a39a..e4bdbbb 100644
--- a/src/main/java/com/zy/system/entity/Config.java
+++ b/src/main/java/com/zy/system/entity/Config.java
@@ -1,8 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/Host.java b/src/main/java/com/zy/system/entity/Host.java
index 28b85ab..ab8c60b 100644
--- a/src/main/java/com/zy/system/entity/Host.java
+++ b/src/main/java/com/zy/system/entity/Host.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index eb93fad..6c4bd85 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -77,7 +77,7 @@
public String getUserId$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.userId);
+ User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
return user.getUsername();
}
diff --git a/src/main/java/com/zy/system/entity/Permission.java b/src/main/java/com/zy/system/entity/Permission.java
index 8373e0f..99bb1f2 100644
--- a/src/main/java/com/zy/system/entity/Permission.java
+++ b/src/main/java/com/zy/system/entity/Permission.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.ResourceService;
@@ -88,7 +88,7 @@
public String getResourceName(){
ResourceService service = SpringUtils.getBean(ResourceService.class);
- Resource resource = service.selectById(this.resourceId);
+ Resource resource = service.getById(this.resourceId);
if (!Cools.isEmpty(resource)){
return resource.getName();
}
diff --git a/src/main/java/com/zy/system/entity/Resource.java b/src/main/java/com/zy/system/entity/Resource.java
index 01b81f9..5611e6b 100644
--- a/src/main/java/com/zy/system/entity/Resource.java
+++ b/src/main/java/com/zy/system/entity/Resource.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.ResourceService;
@@ -102,7 +102,7 @@
public String getResourceName(){
ResourceService service = SpringUtils.getBean(ResourceService.class);
- Resource resource = service.selectById(this.resourceId);
+ Resource resource = service.getById(this.resourceId);
if (!Cools.isEmpty(resource)){
return resource.getName();
}
diff --git a/src/main/java/com/zy/system/entity/Role.java b/src/main/java/com/zy/system/entity/Role.java
index 9f6a998..7ef0c88 100644
--- a/src/main/java/com/zy/system/entity/Role.java
+++ b/src/main/java/com/zy/system/entity/Role.java
@@ -1,8 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.RoleService;
@@ -92,7 +93,7 @@
public String getLeader$(){
RoleService service = SpringUtils.getBean(RoleService.class);
- Role role = service.selectById(this.leader);
+ Role role = service.getById(this.leader);
if (!Cools.isEmpty(role)){
return String.valueOf(role.getName());
}
diff --git a/src/main/java/com/zy/system/entity/RolePermission.java b/src/main/java/com/zy/system/entity/RolePermission.java
index d846f50..970b070 100644
--- a/src/main/java/com/zy/system/entity/RolePermission.java
+++ b/src/main/java/com/zy/system/entity/RolePermission.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.PermissionService;
@@ -62,7 +62,7 @@
public String getRoleName(){
RoleService service = SpringUtils.getBean(RoleService.class);
- Role role = service.selectById(this.roleId);
+ Role role = service.getById(this.roleId);
if (!Cools.isEmpty(role)){
return role.getName();
}
@@ -79,7 +79,7 @@
public String getPermissionName(){
PermissionService service = SpringUtils.getBean(PermissionService.class);
- Permission permission = service.selectById(this.permissionId);
+ Permission permission = service.getById(this.permissionId);
if (!Cools.isEmpty(permission)){
return permission.getName();
}
diff --git a/src/main/java/com/zy/system/entity/RoleResource.java b/src/main/java/com/zy/system/entity/RoleResource.java
index 48d4091..14ba49c 100644
--- a/src/main/java/com/zy/system/entity/RoleResource.java
+++ b/src/main/java/com/zy/system/entity/RoleResource.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index c5086aa..5fa5837 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.HostService;
@@ -82,7 +82,7 @@
public String getHostName() {
HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.selectById(this.hostId);
+ Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
return host.getName();
}
@@ -119,7 +119,7 @@
public String getRoleName(){
RoleService service = SpringUtils.getBean(RoleService.class);
- Role role = service.selectById(this.roleId);
+ Role role = service.getById(this.roleId);
if (!Cools.isEmpty(role)){
return role.getName();
}
diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index a5660aa..017278d 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -1,9 +1,9 @@
package com.zy.system.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -54,7 +54,7 @@
public String getUserUsername(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.userId);
+ User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
return user.getUsername();
}
diff --git a/src/main/java/com/zy/system/mapper/ApiMapper.java b/src/main/java/com/zy/system/mapper/ApiMapper.java
index bd3d145..f93ea99 100644
--- a/src/main/java/com/zy/system/mapper/ApiMapper.java
+++ b/src/main/java/com/zy/system/mapper/ApiMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Api;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/ConfigMapper.java b/src/main/java/com/zy/system/mapper/ConfigMapper.java
index 9ec6ab3..17d2d88 100644
--- a/src/main/java/com/zy/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/system/mapper/ConfigMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Config;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/HostMapper.java b/src/main/java/com/zy/system/mapper/HostMapper.java
index ea5b9c1..a860cb7 100644
--- a/src/main/java/com/zy/system/mapper/HostMapper.java
+++ b/src/main/java/com/zy/system/mapper/HostMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Host;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/OperateLogMapper.java b/src/main/java/com/zy/system/mapper/OperateLogMapper.java
index d002d10..f6128c7 100644
--- a/src/main/java/com/zy/system/mapper/OperateLogMapper.java
+++ b/src/main/java/com/zy/system/mapper/OperateLogMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.OperateLog;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/system/mapper/PermissionMapper.java b/src/main/java/com/zy/system/mapper/PermissionMapper.java
index 3b6a70e..64f4985 100644
--- a/src/main/java/com/zy/system/mapper/PermissionMapper.java
+++ b/src/main/java/com/zy/system/mapper/PermissionMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Permission;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/ResourceMapper.java b/src/main/java/com/zy/system/mapper/ResourceMapper.java
index 3372755..88a99f1 100644
--- a/src/main/java/com/zy/system/mapper/ResourceMapper.java
+++ b/src/main/java/com/zy/system/mapper/ResourceMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Resource;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/RoleMapper.java b/src/main/java/com/zy/system/mapper/RoleMapper.java
index 7900402..ff4dd68 100644
--- a/src/main/java/com/zy/system/mapper/RoleMapper.java
+++ b/src/main/java/com/zy/system/mapper/RoleMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Role;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/RolePermissionMapper.java b/src/main/java/com/zy/system/mapper/RolePermissionMapper.java
index f7815ca..de90de9 100644
--- a/src/main/java/com/zy/system/mapper/RolePermissionMapper.java
+++ b/src/main/java/com/zy/system/mapper/RolePermissionMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.RolePermission;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/RoleResourceMapper.java b/src/main/java/com/zy/system/mapper/RoleResourceMapper.java
index e77e262..21e59c7 100644
--- a/src/main/java/com/zy/system/mapper/RoleResourceMapper.java
+++ b/src/main/java/com/zy/system/mapper/RoleResourceMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.Resource;
import com.zy.system.entity.RoleResource;
import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/zy/system/mapper/UserLoginMapper.java b/src/main/java/com/zy/system/mapper/UserLoginMapper.java
index b275758..3b9d27e 100644
--- a/src/main/java/com/zy/system/mapper/UserLoginMapper.java
+++ b/src/main/java/com/zy/system/mapper/UserLoginMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.UserLogin;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/zy/system/mapper/UserMapper.java b/src/main/java/com/zy/system/mapper/UserMapper.java
index 0e40b22..f6e625e 100644
--- a/src/main/java/com/zy/system/mapper/UserMapper.java
+++ b/src/main/java/com/zy/system/mapper/UserMapper.java
@@ -1,6 +1,6 @@
package com.zy.system.mapper;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.system.entity.User;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/service/ApiService.java b/src/main/java/com/zy/system/service/ApiService.java
index 4d0dca5..313a5d6 100644
--- a/src/main/java/com/zy/system/service/ApiService.java
+++ b/src/main/java/com/zy/system/service/ApiService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Api;
public interface ApiService extends IService<Api> {
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index 7e31e9a..47276a1 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Config;
public interface ConfigService extends IService<Config> {
diff --git a/src/main/java/com/zy/system/service/HostService.java b/src/main/java/com/zy/system/service/HostService.java
index 0643fe1..cc22012 100644
--- a/src/main/java/com/zy/system/service/HostService.java
+++ b/src/main/java/com/zy/system/service/HostService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Host;
public interface HostService extends IService<Host> {
diff --git a/src/main/java/com/zy/system/service/OperateLogService.java b/src/main/java/com/zy/system/service/OperateLogService.java
index 4516f15..ae95457 100644
--- a/src/main/java/com/zy/system/service/OperateLogService.java
+++ b/src/main/java/com/zy/system/service/OperateLogService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.OperateLog;
import java.util.List;
diff --git a/src/main/java/com/zy/system/service/PermissionService.java b/src/main/java/com/zy/system/service/PermissionService.java
index 6e13883..fba20ed 100644
--- a/src/main/java/com/zy/system/service/PermissionService.java
+++ b/src/main/java/com/zy/system/service/PermissionService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Permission;
public interface PermissionService extends IService<Permission> {
diff --git a/src/main/java/com/zy/system/service/ResourceService.java b/src/main/java/com/zy/system/service/ResourceService.java
index 5f4df69..97cf026 100644
--- a/src/main/java/com/zy/system/service/ResourceService.java
+++ b/src/main/java/com/zy/system/service/ResourceService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Resource;
public interface ResourceService extends IService<Resource> {
diff --git a/src/main/java/com/zy/system/service/RolePermissionService.java b/src/main/java/com/zy/system/service/RolePermissionService.java
index a308902..41b11cd 100644
--- a/src/main/java/com/zy/system/service/RolePermissionService.java
+++ b/src/main/java/com/zy/system/service/RolePermissionService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.RolePermission;
public interface RolePermissionService extends IService<RolePermission> {
diff --git a/src/main/java/com/zy/system/service/RoleResourceService.java b/src/main/java/com/zy/system/service/RoleResourceService.java
index 42ef479..b3b939a 100644
--- a/src/main/java/com/zy/system/service/RoleResourceService.java
+++ b/src/main/java/com/zy/system/service/RoleResourceService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Resource;
import com.zy.system.entity.RoleResource;
diff --git a/src/main/java/com/zy/system/service/RoleService.java b/src/main/java/com/zy/system/service/RoleService.java
index 8a23ead..5a7c421 100644
--- a/src/main/java/com/zy/system/service/RoleService.java
+++ b/src/main/java/com/zy/system/service/RoleService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.Role;
public interface RoleService extends IService<Role> {
diff --git a/src/main/java/com/zy/system/service/UserLoginService.java b/src/main/java/com/zy/system/service/UserLoginService.java
index 8bfa7b0..021d043 100644
--- a/src/main/java/com/zy/system/service/UserLoginService.java
+++ b/src/main/java/com/zy/system/service/UserLoginService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.UserLogin;
public interface UserLoginService extends IService<UserLogin> {
diff --git a/src/main/java/com/zy/system/service/UserService.java b/src/main/java/com/zy/system/service/UserService.java
index adf1253..44b82cd 100644
--- a/src/main/java/com/zy/system/service/UserService.java
+++ b/src/main/java/com/zy/system/service/UserService.java
@@ -1,6 +1,6 @@
package com.zy.system.service;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.system.entity.User;
public interface UserService extends IService<User> {
diff --git a/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java b/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java
index 4f92956..06a5e54 100644
--- a/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ApiServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Api;
import com.zy.system.mapper.ApiMapper;
import com.zy.system.service.ApiService;
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index 0a8661c..6d66c66 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Config;
import com.zy.system.mapper.ConfigMapper;
import com.zy.system.service.ConfigService;
diff --git a/src/main/java/com/zy/system/service/impl/HostServiceImpl.java b/src/main/java/com/zy/system/service/impl/HostServiceImpl.java
index 8565c35..3eb2eb2 100644
--- a/src/main/java/com/zy/system/service/impl/HostServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/HostServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Host;
import com.zy.system.mapper.HostMapper;
import com.zy.system.service.HostService;
diff --git a/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java b/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
index 960a05f..8e8509d 100644
--- a/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.system.entity.OperateLog;
import com.zy.system.mapper.OperateLogMapper;
diff --git a/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java b/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java
index d6d3eeb..a3e8869 100644
--- a/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/PermissionServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Permission;
import com.zy.system.mapper.PermissionMapper;
import com.zy.system.service.PermissionService;
diff --git a/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java
index 353b867..59b99d3 100644
--- a/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ResourceServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Resource;
import com.zy.system.mapper.ResourceMapper;
import com.zy.system.service.ResourceService;
diff --git a/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java b/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java
index 8311fb1..d6a33ca 100644
--- a/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RolePermissionServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.RolePermission;
import com.zy.system.mapper.RolePermissionMapper;
import com.zy.system.service.RolePermissionService;
diff --git a/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java
index 35aa081..174e3b0 100644
--- a/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RoleResourceServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Resource;
import com.zy.system.entity.RoleResource;
import com.zy.system.mapper.RoleResourceMapper;
diff --git a/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java b/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
index f86c513..cd8476e 100644
--- a/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/RoleServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.Role;
import com.zy.system.mapper.RoleMapper;
import com.zy.system.service.RoleService;
diff --git a/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java b/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java
index ebe5908..72813c6 100644
--- a/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/UserLoginServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.UserLogin;
import com.zy.system.mapper.UserLoginMapper;
import com.zy.system.service.UserLoginService;
diff --git a/src/main/java/com/zy/system/service/impl/UserServiceImpl.java b/src/main/java/com/zy/system/service/impl/UserServiceImpl.java
index 67c0ce4..8e8cc52 100644
--- a/src/main/java/com/zy/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/UserServiceImpl.java
@@ -1,6 +1,6 @@
package com.zy.system.service.impl;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.system.entity.User;
import com.zy.system.mapper.UserMapper;
import com.zy.system.service.UserService;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8f43631..c072c38 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,10 +7,10 @@
application:
name: @pom.build.finalName@
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=sxlktasrs
- username: sa
- password: sa@123
+ driver-class-name: com.oscar.Driver
+ url: jdbc:oscar://localhost:2003/osrdb?CURRENTSCHEMA=BJYCWMS
+ username: SYSDBA
+ password: szoscar55
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 247a32a..6eb56d3 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -87,7 +87,7 @@
select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStepBarcode" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
+ select top 1 * from asr_wrk_mast where barcode = #{barcode}
</select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
@@ -95,11 +95,11 @@
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
+ select top 1 * from asr_wrk_mast where wrk_no=#{workNo}
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
@@ -107,34 +107,34 @@
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select top 1 * from asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<!-- <!– 鍏ュ簱浠诲姟 –>-->
<!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
-<!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
+<!-- select top 1 * from asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
<!-- </select>-->
<!-- <!– 鍑哄簱浠诲姟 –>-->
<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
<!-- select top 1 *-->
-<!-- from dbo.asr_wrk_mast-->
+<!-- from asr_wrk_mast-->
<!-- where (wrk_sts in (11,12)-->
<!-- or (wrk_sts in (14,15) and wrk_no in-->
<!-- (-->
@@ -148,29 +148,29 @@
<!-- </select>-->
<select id="selectCrnWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectDevWorking" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectPick" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
+ select * from asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
</select>
<select id="selectPakOutStep11" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select * from asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
<select id="selectWorkingPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
</select>
<select id="selectWorkingPakout" resultMap="BaseResultMap">
select top 1 *
- from dbo.asr_wrk_mast
+ from asr_wrk_mast
where (wrk_sts in (11,12)
or (wrk_sts in (14,15) and wrk_no in
(
@@ -183,6 +183,6 @@
order by io_time,wrk_no
</select>
<select id="selectPakoutEmpty" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
+ select top 1 * from asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
</select>
</mapper>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 822e150..34217f6 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/lktwcs";
+var baseUrl = "/bjycwcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 47f97f3..6bc15d6 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "LKTWCS",
+ "mapName": "BJYCWCS",
"rackCount": 4,
"crnCount": 3,
"stbCount": 13,
--
Gitblit v1.9.1