From 9cb0e5c4ec12a052494fef2ce5c6712325350e46 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 25 Mar 2025 16:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4mgr=5Frole=5Fuser=5Forg?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustOrgController.java | 119 ------- .../core/customer/service/CustOrgService.java | 1 - .../service/impl/CustOrgServiceImpl.java | 1 - .../canteen/core/customer/vo/CustOrgVO.java | 292 ------------------ 4 files changed, 413 deletions(-) delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/vo/CustOrgVO.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java deleted file mode 100644 index 40d6c499..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/controller/CustOrgController.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.bonus.canteen.core.customer.controller; - -import cn.hutool.core.lang.tree.Tree; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bonus.canteen.core.common.base.BaseController; -import com.bonus.canteen.core.common.utils.AesEncryptUtil; -import com.bonus.canteen.core.customer.dto.CustOrgPageDTO; -import com.bonus.canteen.core.customer.service.CustOrgService; -import com.bonus.canteen.core.customer.vo.CustOrgVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping({"/custOrg"}) -@Api("customer-组织机构(部门)控制器") -public class CustOrgController extends BaseController { - private static final Logger log = LoggerFactory.getLogger(CustOrgController.class); - @Autowired - @Lazy - private CustOrgService custOrgService; - @Autowired - @Lazy - private AesEncryptUtil aesEncryptUtil; - -// @ApiOperation("分页查询组织") -// @PostMapping({"/queryPageCustOrg"}) -// public Page queryPageCustOrg(@RequestBody CustOrgPageDTO content) { -// Page custOrgVOPage = this.custOrgService.pageCustOrgByParams(new Page(content.getCurrent(), content.getSize()), content); -// Iterator var4 = custOrgVOPage.getRecords().iterator(); -// -// while(var4.hasNext()) { -// CustOrgVO custOrgVO = (CustOrgVO)var4.next(); -// custOrgVO.setOrgTel(this.aesEncryptUtil.aesEncrypt(custOrgVO.getOrgTel())); -// } -// -// return custOrgVOPage; -// } - - -// @RequiresGuest -// @ApiOperation("根据id查询组织") -// @GetMapping({"/queryCustOrgById"}) -// public CustOrg queryCustOrgById(LeRequest request) { -// Map contentMap = (Map)this.gson.fromJson((String)request.getContent(), Map.class); -// return this.custOrgService.getCustOrg(((JSONObject)contentMap.get("object")).getLong("id")); -// } -// -// @RequiresPermissions({"cust:org:add"}) -// @RequiresAuthentication -// @ApiOperation("新增") -// @PostMapping({"/addCustOrg"}) -// public void addCustOrg(@Validated({ValidationGroups.Insert.class}) @RequestBody LeRequest request) { -// CustOrg content = (CustOrg)request.getContent(); -// content.setOrgTel(this.aesEncryptUtil.aesDecode(content.getOrgTel())); -// this.custOrgService.addCustOrg(content); -// } -// -// @RequiresPermissions({"cust:org:edit"}) -// @ApiOperation("根据id修改") -// @PutMapping({"/updateCustOrgById"}) -// @RequiresAuthentication -// public void updateCustOrgById(@Validated({ValidationGroups.Update.class}) @RequestBody LeRequest request) { -// CustOrg content = (CustOrg)request.getContent(); -// content.setOrgTel(this.aesEncryptUtil.aesDecode(content.getOrgTel())); -// this.custOrgService.updateOrg(content); -// } -// -// @RequiresPermissions({"cust:org:del"}) -// @ApiOperation("根据组织id删除") -// @DeleteMapping({"/deleteCustOrgByOrgId"}) -// @RequiresAuthentication -// public void deleteCustOrgByOrgId(@Validated({ValidationGroups.Delete.class}) @RequestBody LeRequest request) { -// this.custOrgService.deleteByOrdId(((CustOrg)request.getContent()).getOrgId()); -// } -// -// @ApiOperation("系统组织树") -// @GetMapping({"/system/tree"}) -// @RequiresGuest -// public List> getSystemOrgTree() { -// return this.custOrgService.getSystemOrgTree(); -// } - -// @ApiOperation("商户权限组织树") -// @PostMapping({"/tenant/tree"}) -//// @RequiresAuthentication -// public List> getTenantOrgTree() { -// return this.custOrgService.getTenantOrgTree(); -// } -// -// @ApiOperation("查询组织下默认就餐地") -// @GetMapping({"/query/diningPlace"}) -// @RequiresGuest -// @RequiresAuthentication -// public JsonNode queryDiningPlace(@RequestParam("orgId") Long orgId) { -// return this.custOrgService.queryDiningPlaceByOrgId(orgId); -// } -// -// @ApiOperation("根据superId查询懒加载子级组织树") -// @PostMapping({"/lazy/org/tree"}) -// public List getPlaceLazyTree(@RequestBody LeRequest request) { -// return this.custOrgService.getOrgLazyTree((CustOrgTreeDTO)request.getContent()); -// } -// -// @ApiOperation("组织树同层级拖动排序") -// @PostMapping({"/dragOrgSort"}) -// public void dragOrgSort(@RequestBody LeRequest request) { -// this.custOrgService.dragOrgSort((CustOrgTreeDTO)request.getContent()); -// } -} 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 3b68158b..c4e5841e 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,7 +1,6 @@ package com.bonus.canteen.core.customer.service; import com.bonus.canteen.core.customer.po.QueryOrgsBasicInfoPO; -import com.bonus.canteen.core.customer.vo.CustOrgVO; import com.bonus.canteen.core.customer.vo.OrgBasicInfoVO; import com.fasterxml.jackson.databind.JsonNode; 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 b056ade8..600f4921 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 @@ -33,7 +33,6 @@ import com.bonus.canteen.core.customer.service.CustOrgCheckService; import com.bonus.canteen.core.customer.service.CustOrgService; import com.bonus.canteen.core.customer.utils.CommonConstants; import com.bonus.canteen.core.customer.utils.CustomerCacheUtil; -import com.bonus.canteen.core.customer.vo.CustOrgVO; import com.bonus.canteen.core.customer.vo.OrgBasicInfoVO; import com.bonus.canteen.core.order.mq.MqUtil; import com.bonus.common.houqin.utils.id.Id; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/vo/CustOrgVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/vo/CustOrgVO.java deleted file mode 100644 index 28be7709..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/vo/CustOrgVO.java +++ /dev/null @@ -1,292 +0,0 @@ -package com.bonus.canteen.core.customer.vo; - -import com.bonus.canteen.core.common.utils.SysUtil; -import com.fasterxml.jackson.databind.JsonNode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.time.LocalDate; -import java.time.LocalDateTime; - -@ApiModel("组织机构表") -@Data -public class CustOrgVO { - @ApiModelProperty("主键自增") - private Long id; - @ApiModelProperty("机构id") - private Long orgId; - @ApiModelProperty("机构全路径id") - private String orgFullId; - @ApiModelProperty("机构编号") - private String orgNum; - @ApiModelProperty("机构名称") - private String orgName; - @ApiModelProperty("机构全称") - private String orgFullName; - @ApiModelProperty("机构级别") - private Integer orgLevel; - @ApiModelProperty("上级机构id") - private Long superId; - @ApiModelProperty("机构负责人") - private String orgHead; - @ApiModelProperty("组织负责人id（cust_id）") - private Long orgHeadId; - @ApiModelProperty("人员编号") - private String custNum; - @ApiModelProperty("人员姓名") - private @NotBlank( - message = "人员姓名不能为空" -) String custName; - @ApiModelProperty("机构电话") - private String orgTel; - @ApiModelProperty("有效截止日期") - private LocalDate endDate; - @ApiModelProperty("就餐地（为新增人员提供默认值）") - private JsonNode diningPlace; - @ApiModelProperty("备注描述") - private 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("节点状态：1全选；2半选") - private Integer halfSelect; - @ApiModelProperty("排序号") - private Integer sort; - @ApiModelProperty("组织图片") - private String picture; - @ApiModelProperty("人员数量（包含子部门）") - private Integer customerNum; - @ApiModelProperty("组织是否过期") - private boolean expires; - - public String getPicture() { - return SysUtil.getCutFileUrl(this.picture); - } - - 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 getCustNum() { - return this.custNum; - } - - public String getCustName() { - return this.custName; - } - - public String getOrgTel() { - return this.orgTel; - } - - 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 getHalfSelect() { - return this.halfSelect; - } - - public Integer getSort() { - return this.sort; - } - - public Integer getCustomerNum() { - return this.customerNum; - } - - public boolean isExpires() { - return this.expires; - } - - public void setId(final Long id) { - this.id = id; - } - - public void setOrgId(final Long orgId) { - this.orgId = orgId; - } - - public void setOrgFullId(final String orgFullId) { - this.orgFullId = orgFullId; - } - - public void setOrgNum(final String orgNum) { - this.orgNum = orgNum; - } - - public void setOrgName(final String orgName) { - this.orgName = orgName; - } - - public void setOrgFullName(final String orgFullName) { - this.orgFullName = orgFullName; - } - - public void setOrgLevel(final Integer orgLevel) { - this.orgLevel = orgLevel; - } - - public void setSuperId(final Long superId) { - this.superId = superId; - } - - public void setOrgHead(final String orgHead) { - this.orgHead = orgHead; - } - - public void setOrgHeadId(final Long orgHeadId) { - this.orgHeadId = orgHeadId; - } - - public void setCustNum(final String custNum) { - this.custNum = custNum; - } - - public void setCustName(final String custName) { - this.custName = custName; - } - - public void setOrgTel(final String orgTel) { - this.orgTel = orgTel; - } - - public void setEndDate(final LocalDate endDate) { - this.endDate = endDate; - } - - public void setDiningPlace(final JsonNode diningPlace) { - this.diningPlace = diningPlace; - } - - public void setRemarks(final String remarks) { - this.remarks = remarks; - } - - public void setIfDel(final Integer ifDel) { - this.ifDel = ifDel; - } - - public void setRevision(final Integer revision) { - this.revision = revision; - } - - public void setCrby(final String crby) { - this.crby = crby; - } - - public void setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; - } - - public void setUpby(final String upby) { - this.upby = upby; - } - - public void setUptime(final LocalDateTime uptime) { - this.uptime = uptime; - } - - public void setHalfSelect(final Integer halfSelect) { - this.halfSelect = halfSelect; - } - - public void setSort(final Integer sort) { - this.sort = sort; - } - - public void setPicture(final String picture) { - this.picture = picture; - } - - public void setCustomerNum(final Integer customerNum) { - this.customerNum = customerNum; - } - - public void setExpires(final boolean expires) { - this.expires = expires; - } - - - - -}