admin/.env.development
@@ -2,8 +2,8 @@ NODE_ENV = 'development' # VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' #VUE_APP_API_URL = 'http://192.168.0.104:10010' VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' VUE_APP_API_URL = 'http://192.168.1.46:10010' # VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' # VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
@@ -1,15 +1,17 @@ spring: # 数据源配置 datasource: # url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai # username: doumee # password: rtjgfEr@&0c0m url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: Doumee@168 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -4,6 +4,7 @@ import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.dao.business.model.Platform; import com.doumee.service.business.third.model.ApiResponse; import com.doumee.service.business.third.model.PageData; import com.doumee.service.business.third.model.PageWrap; @@ -55,6 +56,14 @@ platformGroupService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token)); return ApiResponse.success(null); } @ApiOperation("根据ID修改是否自动叫号") @PostMapping("/updateAutoCallById") @CloudRequiredPermission("business:platformgroup:update") public ApiResponse updateAutoCallById(@RequestBody PlatformGroup platform, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ platform.setLoginUserInfo(this.getLoginUser(token)); platformGroupService.updateAutoCallById(platform); return ApiResponse.success(null); } @ApiOperation("根据ID修改") @PostMapping("/updateById") server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformGroupService.java
@@ -117,4 +117,5 @@ */ PlatformGroupWorkVO getPlatformGroupWork(Integer platformGroupId); void updateAutoCallById(PlatformGroup platform); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -62,9 +63,12 @@ || platformGroup.getType()<0){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } platformGroup.setAutoCall(Constants.formatIntegerNum(platformGroup.getAutoCall())); platformGroup.setIsVirtual(Constants.formatIntegerNum(platformGroup.getIsVirtual())); if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,platformGroup.getType()) .eq(PlatformGroup::getIsVirtual,platformGroup.getIsVirtual()) )>0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该类型分组已经创建，请返回刷新页面查看！"); } @@ -120,6 +124,23 @@ deleteById(id,user); } } @Override public void updateAutoCallById(PlatformGroup platform) { PlatformGroup model =platformGroupMapper.selectById(platform.getId()); if(model ==null) { throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该记录信息不存在！"); } LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(loginUserInfo == null){ loginUserInfo = platform.getLoginUserInfo(); } PlatformGroup update = new PlatformGroup(); update.setId(model.getId()); update.setEditDate(new Date()); update.setEditor(loginUserInfo.getId()); update.setAutoCall(platform.getAutoCall()); platformGroupMapper.updateById(update); } @Override public void updateById(PlatformGroup platformGroup) { @@ -128,9 +149,12 @@ || platformGroup.getType()<0){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } platformGroup.setAutoCall(Constants.formatIntegerNum(platformGroup.getAutoCall())); platformGroup.setIsVirtual(Constants.formatIntegerNum(platformGroup.getIsVirtual())); if(platformGroupMapper.selectCount(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,platformGroup.getType()) .eq(PlatformGroup::getIsVirtual,platformGroup.getIsVirtual()) .ne(PlatformGroup::getId,platformGroup.getId()) )>0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该类型分组已经创建，请返回刷新页面查看！"); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -444,6 +444,7 @@ } } PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda() .eq(PlatformGroup::getIsVirtual,Constants.ZERO)//非虚拟月台 .eq(PlatformGroup::getIsdeleted,Constants.ZERO) .eq(PlatformGroup::getType,type==0?Constants.ZERO:Constants.ONE) .last("limit 1") );//查询卸货月台组编码
