From 36cd73d0b954c93283e5afdf7de0ebf76f932965 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 25 Mar 2025 15:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4custorg=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/CustOrgPointBusiness.java | 4 - .../device/service/CustDeviceService.java | 1 - .../core/customer/mapper/CustOrgMapper.java | 12 - .../canteen/core/customer/model/CustOrg.java | 285 ------------------ .../customer/service/CustOrgCheckService.java | 8 - .../core/customer/service/CustOrgService.java | 7 - .../service/impl/CustOrgServiceImpl.java | 2 - .../mapper/customer/CustOrgMapper.xml | 253 ---------------- 8 files changed, 572 deletions(-) delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/model/CustOrg.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/business/CustOrgPointBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/business/CustOrgPointBusiness.java index 1f5f8ea5..3430bf2e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/business/CustOrgPointBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/business/CustOrgPointBusiness.java @@ -1,10 +1,6 @@ package com.bonus.canteen.core.customer.business; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bonus.canteen.core.customer.dto.CustOrgPageDTO; -import com.bonus.canteen.core.customer.model.CustOrg; -import com.bonus.canteen.core.customer.vo.CustOrgVO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/device/service/CustDeviceService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/device/service/CustDeviceService.java index 7984d267..e9a3be71 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/device/service/CustDeviceService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/device/service/CustDeviceService.java @@ -17,7 +17,6 @@ import com.bonus.canteen.core.customer.dto.SaveFaceInfoResult; import com.bonus.canteen.core.customer.model.CustAccTemp; import com.bonus.canteen.core.customer.model.CustAddr; import com.bonus.canteen.core.customer.model.CustInfo; -import com.bonus.canteen.core.customer.model.CustOrg; import com.bonus.canteen.core.customer.service.CustAccTempService; import com.bonus.canteen.core.customer.service.CustAddrService; import com.bonus.canteen.core.customer.service.CustInfoService; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustOrgMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustOrgMapper.java index 69b9275a..528c2113 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustOrgMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustOrgMapper.java @@ -1,22 +1,10 @@ package com.bonus.canteen.core.customer.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bonus.canteen.core.auth.config.LeNiuDataPermission; -import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum; -import com.bonus.canteen.core.customer.dto.CustOrgPageDTO; -import com.bonus.canteen.core.customer.dto.CustOrgTreeDTO; -import com.bonus.canteen.core.customer.model.CustOrg; -import com.bonus.canteen.core.customer.openapi.vo.OrgQueryVO; import com.bonus.canteen.core.customer.po.QueryOrgsBasicInfoPO; -import com.bonus.canteen.core.customer.po.UpdateChildOrgPO; -import com.bonus.canteen.core.customer.vo.CustOrgVO; import com.bonus.canteen.core.customer.vo.OrgBasicInfoVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - import java.util.List; @Mapper diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/model/CustOrg.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/model/CustOrg.java deleted file mode 100644 index 9bebd23d..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/model/CustOrg.java +++ /dev/null @@ -1,285 +0,0 @@ -package com.bonus.canteen.core.customer.model; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.bonus.canteen.core.common.utils.SysUtil; -import com.bonus.common.houqin.utils.ValidationGroups; -import com.fasterxml.jackson.databind.JsonNode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.time.LocalDate; -import java.time.LocalDateTime; - -//@TableName("cust_org") -//@ApiModel("组织机构表") -@Data -public class CustOrg { - private static final long serialVersionUID = 1L; - @TableId - @ApiModelProperty("主键自增") - private Long id; - @ApiModelProperty("机构id") - private @NotNull( - message = "{customer.org.orgId.nonNull}", - groups = {ValidationGroups.Update.class, ValidationGroups.Delete.class} -) Long orgId; - @ApiModelProperty("机构全路径id") - private String orgFullId; - @ApiModelProperty("机构编号") - private @Size( - max = 128, - message = "{customer.org.num.size.limit}" -) String orgNum; - @ApiModelProperty("机构名称") - private @Size( - min = 1, - max = 50, - message = "{customer.org.name.size.limit}", - groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class} -) String orgName; - @ApiModelProperty("机构全称") - private String orgFullName; - @ApiModelProperty("机构级别") - private Integer orgLevel; - @ApiModelProperty("上级机构id") - private @NotNull( - message = "{customer.org.superOrgId.nonNull}", - groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class} -) Long superId; - @ApiModelProperty("机构负责人") - private String orgHead; - @ApiModelProperty("组织负责人id（cust_id）") - private Long orgHeadId; - @ApiModelProperty("机构电话") - private String orgTel; - @ApiModelProperty("组织图片") - private String picture; - @ApiModelProperty("有效日期") - private LocalDate endDate; - @ApiModelProperty("就餐地（为新增人员提供默认值）") - private JsonNode diningPlace; - @ApiModelProperty("备注描述") - private @Size( - max = 512, - message = "{customer.org.remark.size.limit}", - groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class} -) String remarks; - @ApiModelProperty("是否删除") - private Integer ifDel; - @ApiModelProperty("乐观锁") - private Integer revision; - @ApiModelProperty("创建人") - private String crby; - @ApiModelProperty("创建时间") - private LocalDateTime crtime; - @ApiModelProperty("更新人") - private String upby; - @ApiModelProperty("更新时间") - private LocalDateTime uptime; - @ApiModelProperty("排序号") - private Integer sort; - - public CustOrg setPicture(String picture) { - this.picture = SysUtil.getCutPath(picture); - return this; - } - - public Long getId() { - return this.id; - } - - public Long getOrgId() { - return this.orgId; - } - - public String getOrgFullId() { - return this.orgFullId; - } - - public String getOrgNum() { - return this.orgNum; - } - - public String getOrgName() { - return this.orgName; - } - - public String getOrgFullName() { - return this.orgFullName; - } - - public Integer getOrgLevel() { - return this.orgLevel; - } - - public Long getSuperId() { - return this.superId; - } - - public String getOrgHead() { - return this.orgHead; - } - - public Long getOrgHeadId() { - return this.orgHeadId; - } - - public String getOrgTel() { - return this.orgTel; - } - - public String getPicture() { - return this.picture; - } - - public LocalDate getEndDate() { - return this.endDate; - } - - public JsonNode getDiningPlace() { - return this.diningPlace; - } - - public String getRemarks() { - return this.remarks; - } - - public Integer getIfDel() { - return this.ifDel; - } - - public Integer getRevision() { - return this.revision; - } - - public String getCrby() { - return this.crby; - } - - public LocalDateTime getCrtime() { - return this.crtime; - } - - public String getUpby() { - return this.upby; - } - - public LocalDateTime getUptime() { - return this.uptime; - } - - public Integer getSort() { - return this.sort; - } - - public CustOrg setId(final Long id) { - this.id = id; - return this; - } - - public CustOrg setOrgId(final Long orgId) { - this.orgId = orgId; - return this; - } - - public CustOrg setOrgFullId(final String orgFullId) { - this.orgFullId = orgFullId; - return this; - } - - public CustOrg setOrgNum(final String orgNum) { - this.orgNum = orgNum; - return this; - } - - public CustOrg setOrgName(final String orgName) { - this.orgName = orgName; - return this; - } - - public CustOrg setOrgFullName(final String orgFullName) { - this.orgFullName = orgFullName; - return this; - } - - public CustOrg setOrgLevel(final Integer orgLevel) { - this.orgLevel = orgLevel; - return this; - } - - public CustOrg setSuperId(final Long superId) { - this.superId = superId; - return this; - } - - public CustOrg setOrgHead(final String orgHead) { - this.orgHead = orgHead; - return this; - } - - public CustOrg setOrgHeadId(final Long orgHeadId) { - this.orgHeadId = orgHeadId; - return this; - } - - public CustOrg setOrgTel(final String orgTel) { - this.orgTel = orgTel; - return this; - } - - public CustOrg setEndDate(final LocalDate endDate) { - this.endDate = endDate; - return this; - } - - public CustOrg setDiningPlace(final JsonNode diningPlace) { - this.diningPlace = diningPlace; - return this; - } - - public CustOrg setRemarks(final String remarks) { - this.remarks = remarks; - return this; - } - - public CustOrg setIfDel(final Integer ifDel) { - this.ifDel = ifDel; - return this; - } - - public CustOrg setRevision(final Integer revision) { - this.revision = revision; - return this; - } - - public CustOrg setCrby(final String crby) { - this.crby = crby; - return this; - } - - public CustOrg setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; - return this; - } - - public CustOrg setUpby(final String upby) { - this.upby = upby; - return this; - } - - public CustOrg setUptime(final LocalDateTime uptime) { - this.uptime = uptime; - return this; - } - - public CustOrg setSort(final Integer sort) { - this.sort = sort; - return this; - } - - -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgCheckService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgCheckService.java index 24356265..60b1b96b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgCheckService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgCheckService.java @@ -1,15 +1,7 @@ package com.bonus.canteen.core.customer.service; -import cn.hutool.core.text.CharSequenceUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.bonus.common.core.exception.ServiceException; -import com.bonus.common.houqin.constant.LeConstants; import com.bonus.canteen.core.customer.constants.PersonalStatusEnum; -import com.bonus.canteen.core.customer.mapper.CustOrgMapper; -import com.bonus.canteen.core.customer.model.CustOrg; import com.bonus.common.houqin.i18n.I18n; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgService.java index d9f167f7..3b68158b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/CustOrgService.java @@ -1,12 +1,5 @@ package com.bonus.canteen.core.customer.service; -import cn.hutool.core.lang.tree.Tree; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.bonus.canteen.core.customer.dto.CustAccExcelModel; -import com.bonus.canteen.core.customer.dto.CustOrgPageDTO; -import com.bonus.canteen.core.customer.dto.CustOrgTreeDTO; -import com.bonus.canteen.core.customer.model.CustOrg; import com.bonus.canteen.core.customer.po.QueryOrgsBasicInfoPO; import com.bonus.canteen.core.customer.vo.CustOrgVO; import com.bonus.canteen.core.customer.vo.OrgBasicInfoVO; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustOrgServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustOrgServiceImpl.java index a8309820..b056ade8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustOrgServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustOrgServiceImpl.java @@ -26,8 +26,6 @@ import com.bonus.canteen.core.customer.dto.CustAccExcelModel; import com.bonus.canteen.core.customer.dto.CustOrgPageDTO; import com.bonus.canteen.core.customer.dto.CustOrgTreeDTO; import com.bonus.canteen.core.customer.mapper.CustOrgMapper; -import com.bonus.canteen.core.customer.model.CustInfo; -import com.bonus.canteen.core.customer.model.CustOrg; import com.bonus.canteen.core.customer.po.QueryOrgsBasicInfoPO; import com.bonus.canteen.core.customer.po.UpdateChildOrgPO; import com.bonus.canteen.core.customer.service.CustInfoService; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustOrgMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustOrgMapper.xml index eff1a114..af6554b4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustOrgMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustOrgMapper.xml @@ -1,251 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -