smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/TenantConstant.java
@@ -7,7 +7,6 @@ /** * 租户常量 */ /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/constant/TenantConstant.class */ public interface TenantConstant { public static final String PASS_KEY = "tenant.default.password"; public static final String ACCOUNT_NUMBER_KEY = "tenant.default.accountNumber"; smart-man-boot/src/main/java/com/qianwen/smartman/common/constant/ToolingConstant.java
@@ -1,6 +1,5 @@ package com.qianwen.smartman.common.constant; /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/common/constant/ToolingConstant.class */ public interface ToolingConstant { public static final Long TRAY_ROOT = 5L; public static final Long FIXTURE_ROOT = 4L; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ApplySettingsController.java
@@ -18,7 +18,6 @@ @RestController @ApiResource({"blade-cps/apply-settings"}) @NonDS /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ApplySettingsController.class */ public class ApplySettingsController extends BladeController { private final ICommonGroupService groupService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomMaterialController.java
@@ -31,7 +31,6 @@ @Api(value = "bom物料管理", tags = {"bom物料管理"}) @ApiResource({"blade-cps/bom-material"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/BomMaterialController.class */ public class BomMaterialController extends BladeController { private IBomMaterialService bomMaterialService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomProcessController.java
@@ -32,7 +32,6 @@ @Api(value = "bom物料工序管理", tags = {"bom物料工序管理"}) @ApiResource({"blade-cps/bom-process"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/BomProcessController.class */ public class BomProcessController extends BladeController { private IBomProcessService bomProcessService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/BomVersionController.java
@@ -35,7 +35,6 @@ @Api(value = "bom版本管理", tags = {"bom版本管理"}) @ApiResource({"blade-cps/bom-version"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/BomVersionController.class */ public class BomVersionController extends BladeController { private IBomVersionService bomVersionService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeCheckProjectController.java
@@ -26,7 +26,6 @@ @Api(value = "设备类型-点检项目", tags = {"设备类型-点检项目"}) @ApiResource({"blade-cps/device-type-check-projects"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/DeviceTypeCheckProjectController.class */ public class DeviceTypeCheckProjectController { private final IDeviceCheckService checkService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/DeviceTypeController.java
@@ -42,7 +42,6 @@ @ApiResource({"blade-cps/device-types"}) @NonDS @Validated /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/DeviceTypeController.class */ public class DeviceTypeController { private final IDeviceTypeService deviceTypeService; private final ISystemResourceService systemResourceService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EmployeeController.java
@@ -51,7 +51,6 @@ @RestController @ApiResource({"blade-cps/employee"}) @NonDS /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/EmployeeController.class */ public class EmployeeController extends BladeController { private final IEmployeeService employeeService; private final OssBuilder ossBuilder; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/EnterpriseInformationController.java
@@ -20,7 +20,6 @@ @RestController @ApiResource({"blade-cps/enterprise"}) @NonDS /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/EnterpriseInformationController.class */ public class EnterpriseInformationController { private final IEnterpriseInformationService informationService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/FixtureController.java
@@ -36,7 +36,6 @@ @Api(value = "夹具管理", tags = {"夹具管理"}) @ApiResource({"blade-cps/fixture"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/FixtureController.class */ public class FixtureController extends BladeController { private final IFixtureService fixtureService; private final ISystemResourceService systemResourceService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MachineController.java
@@ -46,7 +46,6 @@ @RestController @ApiResource({"blade-cps/machine"}) @NonDS /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/MachineController.class */ public class MachineController { private final IMachineService machineService; private final ISystemResourceService systemResourceService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductionCraftProcessController.java
@@ -37,7 +37,6 @@ @Api(value = "工艺版本的工序流程管理", tags = {"工艺版本的工序流程管理"}) @ApiResource({"blade-cps/production-craft-process"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ProductionCraftProcessController.class */ public class ProductionCraftProcessController extends BladeController { private final IProductionCraftProcessService craftProcessService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductionCraftVersionController.java
@@ -27,7 +27,6 @@ @Api(value = "产品工艺版本管理", tags = {"产品工艺版本管理"}) @ApiResource({"blade-cps/production-craft-version"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ProductionCraftVersionController.class */ public class ProductionCraftVersionController extends BladeController { private final IProductionCraftVersionService versionService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftController.java
@@ -1,18 +1,19 @@ package com.qianwen.smartman.modules.cps.controller; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.lang.invoke.SerializedLambda; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; import com.qianwen.core.boot.ctrl.BladeController; import com.qianwen.core.mp.support.Condition; import com.qianwen.core.mp.support.Query; @@ -37,16 +38,13 @@ import com.qianwen.smartman.modules.cps.vo.ShiftUpdateBasicVO; import com.qianwen.smartman.modules.cps.vo.ShiftUpdateVO; import com.qianwen.smartman.modules.cps.vo.ShiftVO; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @ApiResource({"blade-cps/shift"}) @Api(value = "班次controller", tags = {"班次controller"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ShiftController.class */ public class ShiftController extends BladeController { private final IShiftModelService shiftModelService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/I18nDataController.java
@@ -40,7 +40,6 @@ @RestController @ApiResource({"blade-system/i18n/i18n-data"}) @Validated /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/I18nDataController.class */ public class I18nDataController { private final I18nDataService i18nDataService; private final ISystemResourceService systemResourceService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/I18nDataServiceImpl.java
@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile; @Service /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/I18nDataServiceImpl.class */ public class I18nDataServiceImpl extends ServiceImpl<I18nDataMapper, I18nData> implements I18nDataService { private final StringRedisTemplate stringRedisTemplate; private final OssBuilder ossBuilder; @@ -50,7 +49,7 @@ this.ossBuilder = ossBuilder; } @Override // org.springblade.modules.system.service.I18nDataService @Override public IPage<I18nData> selectPage(IPage<I18nData> page, I18nDataQueryDTO queryDTO) { return page(page, wrapper(queryDTO)); } @@ -69,19 +68,19 @@ }); } @Override // org.springblade.modules.system.service.I18nDataService @Override public List<I18nData> queryList(I18nDataQueryDTO i18nDataQO) { return ((I18nDataMapper) this.baseMapper).selectList(wrapper(i18nDataQO)); } @Override // org.springblade.modules.system.service.I18nDataService @Override public List<I18nData> listByCode(String code) { return this.baseMapper.selectList(Wrappers.lambdaQuery(I18nData.class).eq((v0) -> { return v0.getCode(); }, code)); } @Override // org.springblade.modules.system.service.I18nDataService @Override public I18nData getByCodeAndLanguageTag(String code, String languageTag) { return this.baseMapper.selectOne(Wrappers.lambdaQuery(I18nData.class).eq((v0) -> { return v0.getCode(); @@ -94,7 +93,7 @@ return SqlHelper.retBool(Integer.valueOf(((I18nDataMapper) getBaseMapper()).insert(entity))); } @Override // org.springblade.modules.system.service.I18nDataService @Override public I18nData updateById(I18nDataDTO i18nDataDTO) { I18nData entity = I18nDataConverter.INSTANCE.convert(i18nDataDTO); boolean updateSuccess = updateById(entity); @@ -105,7 +104,7 @@ throw new ServiceException("修改国际化信息失败"); } @Override // org.springblade.modules.system.service.I18nDataService @Override @Transactional(rollbackFor = {Exception.class}) public BladeFile importI18nData(List<I18nDataExcelVO> data) { if (Func.isEmpty(data)) { @@ -194,7 +193,7 @@ return this.baseMapper.selectList(lambdaQuery); } @Override // org.springblade.modules.system.service.I18nDataService @Override public BladeFile exportExcel(I18nDataQueryDTO i18nDataQO, HttpServletResponse response) { List<I18nData> list = queryList(i18nDataQO); List<I18nDataExcelVO> excelVOS = list.stream().map(I18nDataConverter.INSTANCE::poToExcelVo).collect(Collectors.toList());