diff --git a/sgzb-auth/pom.xml b/sgzb-auth/pom.xml index 3b591db..31df5a8 100644 --- a/sgzb-auth/pom.xml +++ b/sgzb-auth/pom.xml @@ -41,10 +41,10 @@ - - org.springframework.boot - spring-boot-starter-actuator - + + + + diff --git a/sgzb-gateway/pom.xml b/sgzb-gateway/pom.xml index 8f083e4..ef290ad 100644 --- a/sgzb-gateway/pom.xml +++ b/sgzb-gateway/pom.xml @@ -53,10 +53,10 @@ - - org.springframework.boot - spring-boot-starter-actuator - + + + + diff --git a/sgzb-modules/sgzb-file/pom.xml b/sgzb-modules/sgzb-file/pom.xml index 89fbb84..3c36a96 100644 --- a/sgzb-modules/sgzb-file/pom.xml +++ b/sgzb-modules/sgzb-file/pom.xml @@ -43,10 +43,10 @@ - - org.springframework.boot - spring-boot-starter-actuator - + + + + diff --git a/sgzb-modules/sgzb-gen/pom.xml b/sgzb-modules/sgzb-gen/pom.xml index 71676ad..cf45c1b 100644 --- a/sgzb-modules/sgzb-gen/pom.xml +++ b/sgzb-modules/sgzb-gen/pom.xml @@ -36,10 +36,10 @@ - - org.springframework.boot - spring-boot-starter-actuator - + + + + diff --git a/sgzb-modules/sgzb-job/pom.xml b/sgzb-modules/sgzb-job/pom.xml index 4d23da7..b910e7c 100644 --- a/sgzb-modules/sgzb-job/pom.xml +++ b/sgzb-modules/sgzb-job/pom.xml @@ -36,10 +36,10 @@ - - org.springframework.boot - spring-boot-starter-actuator - + + + + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 6617e2f..c6ca6c3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1402,7 +1402,7 @@ public class TmTaskServiceImpl implements TmTaskService { log.info("dataString-=========:" + data); resultDataHandler(data); } catch (Exception e) { - log.error("请求失败！{}", e); + log.error("推送失败！{}", e); return AjaxResult.error("推送失败！"); } //更改推送的状态 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 66fa3c0..d583f6e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM; import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE; @@ -270,7 +272,11 @@ public class MaTypeController extends BaseController { public AjaxResult edit(@RequestBody MaType maType) { Long parentId = maType.getParentId(); List subMas = maTypeMapper.getListByParentId(parentId, null); - boolean containsSameBrother = subMas.stream().anyMatch(o -> o.getTypeName().equals(maType.getTypeName())); + List filteredItems = subMas.stream().collect(Collectors.toList()); + if (Objects.nonNull(maType.getTypeId())) { + filteredItems = subMas.stream().filter(item -> !maType.getTypeId().equals(item.getTypeId())).collect(Collectors.toList()); + } + boolean containsSameBrother = filteredItems.stream().anyMatch(o -> o.getTypeName().equals(maType.getTypeName())); if (containsSameBrother) { return AjaxResult.error("修改失败，同级存在相同名称"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java index b840e09..8a01f15 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java @@ -5,12 +5,10 @@ import com.bonus.sgzb.base.service.IMaTypeKeeperService; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import com.bonus.sgzb.system.api.domain.SysDept; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,11 +54,18 @@ public class MaTypeKeeperController extends BaseController { return getDataTable(maTypeKeeperService.getListByMaType(userId, typeName)); } - @ApiOperation(value = "查询全部库管员信息") - @GetMapping("/getMaTypeKeeper") - public AjaxResult getMaTypeKeeper(){ - List maTypeList = maTypeKeeperService.getMaTypeKeeper(); + @ApiOperation(value = "查询库管员信息") + @PostMapping("/getMaTypeKeeper") + public AjaxResult getMaTypeKeeper(SysDept sysDept){ + List maTypeList = maTypeKeeperService.getMaTypeKeeper(sysDept); return AjaxResult.success(maTypeList); } + + @ApiOperation(value = "查询公司信息") + @PostMapping("/getEnterprise") + public AjaxResult getEnterprise(SysDept sysDept){ + SysDept sysDeptRes = maTypeKeeperService.getEnterprise(sysDept); + return AjaxResult.success(sysDeptRes); + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/DeptMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/DeptMapper.java index d160c71..6ea5442 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/DeptMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/DeptMapper.java @@ -8,4 +8,6 @@ import java.util.List; @Mapper public interface DeptMapper { public List getDeptList(); + + SysDept getDeptBySocialCreditCode(SysDept sysDept); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java index 16f6923..2bbb3b9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaTypeKeeperMapper.java @@ -35,6 +35,6 @@ public interface MaTypeKeeperMapper { * 查询全部库管员信息 * @return */ - List getMaTypeKeeper(); + List getMaTypeKeeper(Long deptId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java index 46e769e..24c5f28 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/IMaTypeKeeperService.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.base.service; import com.bonus.sgzb.base.domain.MaKeeperUser; import com.bonus.sgzb.base.vo.DeptUser; import com.bonus.sgzb.base.vo.MaTypeKeeperVO; +import com.bonus.sgzb.system.api.domain.SysDept; import java.util.List; @@ -33,6 +34,13 @@ public interface IMaTypeKeeperService { * 查询全部库管员信息 * @return */ - List getMaTypeKeeper(); + List getMaTypeKeeper(SysDept sysDept); + + /** + * 查询企业信息 + * @param sysDept + * @return + */ + SysDept getEnterprise(SysDept sysDept); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java index 3797f00..c3db70d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeKeeperServiceImpl.java @@ -1,13 +1,17 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.domain.MaKeeperUser; +import com.bonus.sgzb.base.mapper.DeptMapper; import com.bonus.sgzb.base.mapper.MaTypeKeeperMapper; import com.bonus.sgzb.base.service.IMaTypeKeeperService; import com.bonus.sgzb.base.vo.DeptUser; import com.bonus.sgzb.base.vo.MaTypeKeeperVO; +import com.bonus.sgzb.system.api.domain.SysDept; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -16,12 +20,16 @@ import java.util.List; * @author makejava * @since 2023-11-28 15:34:03 */ +@Slf4j @Service("maTypeKeeperService") public class MaTypeKeeperServiceImpl implements IMaTypeKeeperService { - @Autowired + @Resource private MaTypeKeeperMapper maTypeKeeperMapper; + @Resource + private DeptMapper deptMapper; + /** * 根据人员名称查询左侧列表 * @param userName @@ -46,12 +54,24 @@ public class MaTypeKeeperServiceImpl implements IMaTypeKeeperService { } /** - * 查询全部库管员信息 + * 查询库管员信息 * @return */ @Override - public List getMaTypeKeeper() { - return maTypeKeeperMapper.getMaTypeKeeper(); + public List getMaTypeKeeper(SysDept sysDept) { + log.info("MaTypeKeeperServiceImpl getMaTypeKeeper {}", sysDept); + //根据企业机构代码（统一社会信用代码）获取企业信息 + sysDept = deptMapper.getDeptBySocialCreditCode(sysDept); + //获取该企业下的库管员 + return maTypeKeeperMapper.getMaTypeKeeper(sysDept.getDeptId()); + } + + @Override + public SysDept getEnterprise(SysDept sysDept) { + log.info("MaTypeKeeperServiceImpl getEnterprise {}", sysDept); + //根据企业机构代码（统一社会信用代码）获取企业信息 + sysDept = deptMapper.getDeptBySocialCreditCode(sysDept); + return sysDept; } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java index a659a96..babb53e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java @@ -56,6 +56,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi * @return */ public String genderBackCode() { + log.info("enter method genderBackCode"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); @@ -68,6 +69,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi } else { code = "PD" + format + "-000" + taskNum; } + log.info("end method genderBackCode" + code); return code; } @@ -97,7 +99,8 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi //判断提交表单中是否存在相同编码 for (int i = 0; i < machIneDtoList.size() - 1; i++) { for (int j = i + 1; j < machIneDtoList.size(); j++) { - if (machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) { + if (StringUtils.isNotEmpty(machIneDtoList.get(i).getMaCode()) && StringUtils.isNotEmpty(machIneDtoList.get(j).getMaCode()) + && machIneDtoList.get(i).getMaCode().equals(machIneDtoList.get(j).getMaCode())) { throw new ServiceException("列表中包含以下相同的设备编码，请修改后重新提交：" + machIneDtoList.get(i).getMaCode()); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/DeptMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/DeptMapper.xml index ace92b3..a43ba54 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/DeptMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/DeptMapper.xml @@ -40,9 +40,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time, update_by, update_time from sys_dept - + + - insert into bm_unit_info ( unit_name, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml index 3a1ea30..3dc97e2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaTypeKeeperMapper.xml @@ -28,13 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/sgzb-modules/sgzb-system/pom.xml b/sgzb-modules/sgzb-system/pom.xml index 39d1eca..428a1de 100644 --- a/sgzb-modules/sgzb-system/pom.xml +++ b/sgzb-modules/sgzb-system/pom.xml @@ -43,10 +43,10 @@ - - org.springframework.boot - spring-boot-starter-actuator - + + + +