From e19227de97d21c10fd22536f85c8153e63072d0c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 06 五月 2024 11:30:54 +0800
Subject: [PATCH] 代码整理1
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainProjectServiceImpl.java | 35 ++++++++---------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveNewVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsUsageVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSubmitVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WcsAndAchievementsVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSingleVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainRecordItemServiceImpl.java | 14 +++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWorkbenchVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationRealTimeStatusVO.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IInitBusinessService.java | 1
smart-man-boot/src/main/resources/com/qianwen/smartman/modules/cps/mapper/InitMapper.xml | 4 +-
15 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IInitBusinessService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IInitBusinessService.java
index 4df92ab..970b18e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IInitBusinessService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/IInitBusinessService.java
@@ -2,7 +2,6 @@
import com.qianwen.smartman.modules.cps.vo.ConfigVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/IInitBusinessService.class */
public interface IInitBusinessService {
void initApp(Integer appId, ConfigVO configVO) throws Exception;
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
index b640884..ba5319d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitServiceImpl.java
@@ -164,7 +164,7 @@
@Override
public Boolean init(InitSettingVO initSettingVO) {
- if (!checkIsNeedInit().booleanValue()) {
+ if (!checkIsNeedInit()) {
throw new ServiceException(MessageUtils.message("system.has.been.initialized", new Object[0]));
}
RedisConnection redisConnection = this.bladeRedis.getRedisTemplate().getRequiredConnectionFactory().getConnection();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainProjectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainProjectServiceImpl.java
index a787411..8d90cda 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainProjectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainProjectServiceImpl.java
@@ -1,23 +1,26 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.secure.utils.AuthUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.MaintainProjectConvert;
import com.qianwen.smartman.modules.cps.entity.MaintainProject;
import com.qianwen.smartman.modules.cps.entity.MaintainProjectItem;
@@ -32,10 +35,6 @@
import com.qianwen.smartman.modules.tpm.entity.MaintainPlan;
import com.qianwen.smartman.modules.tpm.enums.MaintainPlanStatusEnum;
import com.qianwen.smartman.modules.tpm.service.IMaintainPlanService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
public class MaintainProjectServiceImpl extends ServiceImpl<MaintainProjectMapper, MaintainProject> implements IMaintainProjectService {
@@ -46,7 +45,7 @@
private IMaintainPlanService maintainPlanService;
- @Override // org.springblade.modules.cps.service.IMaintainProjectService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public MaintainProject createMaintainProject(MaintainProjectAddVO maintainProjectAddVO) {
if (checkCodeIsExist(maintainProjectAddVO.getCode(), null)) {
@@ -57,7 +56,7 @@
return maintainProject;
}
- @Override // org.springblade.modules.cps.service.IMaintainProjectService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public MaintainProject editMaintainProject(MaintainProjectUpdateVO maintainProjectUpdateVO) {
MaintainProject byId = (MaintainProject) getById(maintainProjectUpdateVO.getId());
@@ -72,7 +71,7 @@
return maintainProject;
}
- @Override // org.springblade.modules.cps.service.IMaintainProjectService
+ @Override
public MaintainProjectVO queryMaintainProject(Long id) {
MaintainProject maintainProject = (MaintainProject) getById(id);
if (maintainProject == null) {
@@ -84,7 +83,7 @@
return maintainProjectVo;
}
- @Override // org.springblade.modules.cps.service.IMaintainProjectService
+ @Override
public List<MaintainProjectVO> queryMaintainProjectList(Long deviceTypeId) {
List<MaintainProject> list = list(Wrappers.<MaintainProject>query().lambda()
.eq(MaintainProject::getDeviceTypeId, deviceTypeId)
@@ -97,7 +96,7 @@
return MaintainProjectConvert.INSTANCE.convert(list);
}
- @Override // org.springblade.modules.cps.service.IMaintainProjectService
+ @Override
public IPage<MaintainProjectVO> queryMaintainProjectListPage(Long deviceTypeId, Query query) {
//MaintainProject d;d.getDeviceTypeName()
@@ -114,7 +113,7 @@
}).orElse(new Page<>());
}
- @Override // org.springblade.modules.cps.service.IMaintainProjectService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteMaintainProject(Long id) {
removeById(id);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainRecordItemServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainRecordItemServiceImpl.java
index 71a5a69..dc258d3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainRecordItemServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MaintainRecordItemServiceImpl.java
@@ -1,12 +1,12 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.Func;
@@ -15,13 +15,11 @@
import com.qianwen.smartman.modules.tpm.entity.MaintainRecordItem;
import com.qianwen.smartman.modules.tpm.mapper.MaintainRecordItemMapper;
import com.qianwen.smartman.modules.tpm.vo.MaintainRecordItemVO;
-import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/MaintainRecordItemServiceImpl.class */
public class MaintainRecordItemServiceImpl extends ServiceImpl<MaintainRecordItemMapper, MaintainRecordItem> implements IMaintainRecordItemService {
- @Override // org.springblade.modules.cps.service.IMaintainRecordItemService
+ @Override
public List<MaintainRecordItemVO> getMaintainRecordItemListByRecordId(Long recordId, String tenantId) {
List<MaintainRecordItem> list = list(Wrappers.<MaintainRecordItem>query().lambda()
.eq(MaintainRecordItem::getRecordId, recordId)
@@ -38,7 +36,7 @@
return MaintainRecordItemConvert.INSTANCE.convert(list);
}
- @Override // org.springblade.modules.cps.service.IMaintainRecordItemService
+ @Override
public IPage<MaintainRecordItemVO> queryMaintainRecordItemListPage(Long recordId, String tenantId, Query query) {
IPage<MaintainRecordItem> pages = page(Condition.getPage(query),Wrappers.<MaintainRecordItem>query().lambda()
.eq(Func.isNotEmpty(tenantId), MaintainRecordItem::getTenantId, tenantId)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WcsAndAchievementsVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WcsAndAchievementsVO.java
index 9fd2edf..0746502 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WcsAndAchievementsVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WcsAndAchievementsVO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WcsAndAchievementsVO.class */
public class WcsAndAchievementsVO implements Serializable {
@ApiModelProperty("鐘舵�佺爜")
private String code;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationRealTimeStatusVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationRealTimeStatusVO.java
index f0e64af..964baa5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationRealTimeStatusVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationRealTimeStatusVO.java
@@ -7,7 +7,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationRealTimeStatusVO.class */
public class WorkstationRealTimeStatusVO implements Serializable {
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "宸ヤ綅id", dataType = "Long")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSingleVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSingleVO.java
index e41270d..d8948a6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSingleVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSingleVO.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationSingleVO.class */
public class WorkstationSingleVO implements Serializable {
@ApiModelProperty("宸ヤ綅id")
private Long workstationId;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSubmitVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSubmitVO.java
index d6434a6..ac8d124 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSubmitVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationSubmitVO.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import java.util.List;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationSubmitVO.class */
public class WorkstationSubmitVO implements Serializable {
private static final long serialVersionUID = -8938927851683015090L;
@ApiModelProperty("宸ヤ綅鍥剧墖鍦板潃")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationVO.java
index 5bd4564..f272cee 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationVO.java
@@ -10,7 +10,6 @@
import com.qianwen.smartman.modules.system.vo.ICard;
@CodeRuleObjectType(MetaObjectTypeEnum.WORK_STATION)
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationVO.class */
public class WorkstationVO implements ICard {
private static final long serialVersionUID = -8938927851683015090L;
@ApiModelProperty("宸ヤ綅鍥剧墖鍦板潃")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveNewVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveNewVO.java
index 3be13c9..25b74d2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveNewVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveNewVO.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationWcsSaveNewVO.class */
public class WorkstationWcsSaveNewVO implements Serializable {
private static final long serialVersionUID = -8474615909932057153L;
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveVO.java
index 7a7ce66..d4bd8f8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsSaveVO.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import com.qianwen.core.tool.utils.Func;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationWcsSaveVO.class */
public class WorkstationWcsSaveVO implements Serializable {
private static final long serialVersionUID = 6406569428341022321L;
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsUsageVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsUsageVO.java
index 8c33b93..738f0e6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsUsageVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsUsageVO.java
@@ -4,7 +4,6 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationWcsUsageVO.class */
public class WorkstationWcsUsageVO implements Serializable {
private String id;
@NotNull(message = "{workstation.wcs.usage.collectType.notnull}")
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsVO.java
index a4f69ee..6da2226 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWcsVO.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import javax.validation.constraints.NotNull;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationWcsVO.class */
public class WorkstationWcsVO implements Serializable {
private static final long serialVersionUID = -8474615909932057153L;
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWorkbenchVO.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWorkbenchVO.java
index adc7caf..7dd155a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWorkbenchVO.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/vo/WorkstationWorkbenchVO.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModelProperty;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/vo/WorkstationWorkbenchVO.class */
public class WorkstationWorkbenchVO {
@ApiModelProperty(value = "宸ヤ綔鍙癐D", dataType = "java.lang.String")
private Long id;
diff --git a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/cps/mapper/InitMapper.xml b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/cps/mapper/InitMapper.xml
index 939db94..b496344 100644
--- a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/cps/mapper/InitMapper.xml
+++ b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/cps/mapper/InitMapper.xml
@@ -21,7 +21,7 @@
`bucket_name`, `app_id`, `region`, `remark`, `create_user`, `create_dept`,
`create_time`, `update_user`, `update_time`, `status`, `is_deleted`)
VALUES (1132486733992468482, '000000', 1, 'minio', #{initSettingVO.ossUrl}, #{initSettingVO.accessKey},
- #{initSettingVO.secretKey}, 'bladex',
+ #{initSettingVO.secretKey}, 'smartm',
'', '', '', 1123598821738675201, 1123598813738675201, NOW(), NULL,
NULL, 2, 0);
@@ -92,7 +92,7 @@
bucket_name, app_id, region, remark, create_user, create_dept,
create_time, update_user, update_time, status, is_deleted)
VALUES (1132486733992468482, '000000', 1, 'minio', #{initSettingVO.ossUrl}, #{initSettingVO.accessKey},
- #{initSettingVO.secretKey}, 'bladex',
+ #{initSettingVO.secretKey}, 'smartm',
'', '', '', 1123598821738675201, 1123598813738675201, NOW(), NULL,
NULL, 2, 0);
--
Gitblit v1.9.3