diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteLineController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteLineController.java new file mode 100644 index 00000000..4de67b4f --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteLineController.java @@ -0,0 +1,103 @@ +package com.op.mes.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.mes.domain.ProRouteLine; +import com.op.mes.service.IProRouteLineService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 工艺线体关联Controller + * + * @author Open Platform + * @date 2023-07-13 + */ +@RestController +@RequestMapping("/pro/routeprodline") +public class ProRouteLineController extends BaseController { + @Autowired + private IProRouteLineService proRouteLineService; + + /** + * 查询工艺线体关联列表 + */ + //@RequiresPermissions("system:line:list") + @GetMapping("/list") + public TableDataInfo list(ProRouteLine proRouteLine) { + startPage(); + List list = proRouteLineService.selectProRouteLineList(proRouteLine); + return getDataTable(list); + } + + /** + * 导出工艺线体关联列表 + */ + //@RequiresPermissions("system:line:export") + @Log(title = "工艺线体关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProRouteLine proRouteLine) { + List list = proRouteLineService.selectProRouteLineList(proRouteLine); + ExcelUtil util = new ExcelUtil(ProRouteLine.class); + util.exportExcel(response, list, "工艺线体关联数据"); + } + + /** + * 获取工艺线体关联详细信息 + */ + //@RequiresPermissions("system:line:query") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") String recordId) { + return success(proRouteLineService.selectProRouteLineByRecordId(recordId)); + } + + /** + * 新增工艺线体关联 + */ + //@RequiresPermissions("system:line:add") + @Log(title = "工艺线体关联", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProRouteLine proRouteLine) { + return toAjax(proRouteLineService.insertProRouteLine(proRouteLine)); + } + + /** + * 修改工艺线体关联 + */ + //@RequiresPermissions("system:line:edit") + @Log(title = "工艺线体关联", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProRouteLine proRouteLine) { + return toAjax(proRouteLineService.updateProRouteLine(proRouteLine)); + } + + /** + * 删除工艺线体关联 + */ + //@RequiresPermissions("system:line:remove") + @Log(title = "工艺线体关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable String[] recordIds) { + return toAjax(proRouteLineService.deleteProRouteLineByRecordIds(recordIds)); + } + + /**穿梭框**/ + @GetMapping("/getList") + public ProRouteLine getList(ProRouteLine proRouteLine) { + return proRouteLineService.getList(proRouteLine); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java index ce270428..2c6740a3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java @@ -21,6 +21,10 @@ public class ProOrder extends TreeEntity { /** 计划工厂编码 */ @Excel(name = "计划工厂编码") + private String planFactoryCode; + + /** 计划工厂编码 */ + @Excel(name = "工厂编码") private String factoryCode; /** 订单类型 */ @@ -93,6 +97,14 @@ public class ProOrder extends TreeEntity { @Excel(name = "上级工单") private String parentOrder; + public String getPlanFactoryCode() { + return planFactoryCode; + } + + public void setPlanFactoryCode(String planFactoryCode) { + this.planFactoryCode = planFactoryCode; + } + /** 产品类型 */ @Excel(name = "产品类型") private String prodType; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteLine.java new file mode 100644 index 00000000..c2a46361 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteLine.java @@ -0,0 +1,183 @@ +package com.op.mes.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.List; + +/** + * 工艺线体关联对象 pro_route_line + * + * @author Open Platform + * @date 2023-07-13 + */ +public class ProRouteLine extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 记录ID */ + private String recordId; + + /** 工艺路线ID */ + @Excel(name = "工艺路线ID") + private String routeId; + + /** 线体ID */ + @Excel(name = "线体ID") + private String itemId; + + /** 线体编码 */ + @Excel(name = "线体编码") + private String itemCode; + + /** 线体名称 */ + @Excel(name = "线体名称") + private String itemName; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + @Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + @Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + @Excel(name = "预留字段4") + private String attr4; + + private String key; + private String label; + private List unSelect; + private List selected; + private List selectedValues; + + public List getSelectedValues() { + return selectedValues; + } + + public void setSelectedValues(List selectedValues) { + this.selectedValues = selectedValues; + } + + public List getUnSelect() { + return unSelect; + } + + public void setUnSelect(List unSelect) { + this.unSelect = unSelect; + } + + public List getSelected() { + return selected; + } + + public void setSelected(List selected) { + this.selected = selected; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setRouteId(String routeId) { + this.routeId = routeId; + } + + public String getRouteId() { + return routeId; + } + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getItemId() { + return itemId; + } + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemCode() { + return itemCode; + } + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getItemName() { + return itemName; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("routeId", getRouteId()) + .append("itemId", getItemId()) + .append("itemCode", getItemCode()) + .append("itemName", getItemName()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteLineMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteLineMapper.java new file mode 100644 index 00000000..e694a96f --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteLineMapper.java @@ -0,0 +1,68 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.ProRouteLine; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工艺线体关联Mapper接口 + * + * @author Open Platform + * @date 2023-07-13 + */ +@Mapper +public interface ProRouteLineMapper { + /** + * 查询工艺线体关联 + * + * @param recordId 工艺线体关联主键 + * @return 工艺线体关联 + */ + public ProRouteLine selectProRouteLineByRecordId(String recordId); + + /** + * 查询工艺线体关联列表 + * + * @param proRouteLine 工艺线体关联 + * @return 工艺线体关联集合 + */ + public List selectProRouteLineList(ProRouteLine proRouteLine); + + /** + * 新增工艺线体关联 + * + * @param proRouteLine 工艺线体关联 + * @return 结果 + */ + public int insertProRouteLine(ProRouteLine proRouteLine); + + /** + * 修改工艺线体关联 + * + * @param proRouteLine 工艺线体关联 + * @return 结果 + */ + public int updateProRouteLine(ProRouteLine proRouteLine); + + /** + * 删除工艺线体关联 + * + * @param recordId 工艺线体关联主键 + * @return 结果 + */ + public int deleteProRouteLineByRecordId(String recordId); + + /** + * 批量删除工艺线体关联 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProRouteLineByRecordIds(String[] recordIds); + + public List getRouteProdLineListUndo(ProRouteLine proRouteLine); + List getRouteProdLineListDo(ProRouteLine proRouteLine); + + void deleteByRouteId(ProRouteLine proRouteLine); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteLineService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteLineService.java new file mode 100644 index 00000000..cac81023 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteLineService.java @@ -0,0 +1,62 @@ +package com.op.mes.service; + +import java.util.List; +import com.op.mes.domain.ProRouteLine; + +/** + * 工艺线体关联Service接口 + * + * @author Open Platform + * @date 2023-07-13 + */ +public interface IProRouteLineService { + /** + * 查询工艺线体关联 + * + * @param recordId 工艺线体关联主键 + * @return 工艺线体关联 + */ + public ProRouteLine selectProRouteLineByRecordId(String recordId); + + /** + * 查询工艺线体关联列表 + * + * @param proRouteLine 工艺线体关联 + * @return 工艺线体关联集合 + */ + public List selectProRouteLineList(ProRouteLine proRouteLine); + + /** + * 新增工艺线体关联 + * + * @param proRouteLine 工艺线体关联 + * @return 结果 + */ + public int insertProRouteLine(ProRouteLine proRouteLine); + + /** + * 修改工艺线体关联 + * + * @param proRouteLine 工艺线体关联 + * @return 结果 + */ + public int updateProRouteLine(ProRouteLine proRouteLine); + + /** + * 批量删除工艺线体关联 + * + * @param recordIds 需要删除的工艺线体关联主键集合 + * @return 结果 + */ + public int deleteProRouteLineByRecordIds(String[] recordIds); + + /** + * 删除工艺线体关联信息 + * + * @param recordId 工艺线体关联主键 + * @return 结果 + */ + public int deleteProRouteLineByRecordId(String recordId); + + ProRouteLine getList(ProRouteLine proRouteLine); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteLineServiceImpl.java new file mode 100644 index 00000000..41804e7b --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteLineServiceImpl.java @@ -0,0 +1,120 @@ +package com.op.mes.service.impl; + +import java.util.Date; +import java.util.List; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.ProRouteLineMapper; +import com.op.mes.domain.ProRouteLine; +import com.op.mes.service.IProRouteLineService; + +/** + * 工艺线体关联Service业务层处理 + * + * @author Open Platform + * @date 2023-07-13 + */ +@Service +public class ProRouteLineServiceImpl implements IProRouteLineService { + @Autowired + private ProRouteLineMapper proRouteLineMapper; + + /** + * 查询工艺线体关联 + * + * @param recordId 工艺线体关联主键 + * @return 工艺线体关联 + */ + @Override + public ProRouteLine selectProRouteLineByRecordId(String recordId) { + return proRouteLineMapper.selectProRouteLineByRecordId(recordId); + } + + /** + * 查询工艺线体关联列表 + * + * @param proRouteLine 工艺线体关联 + * @return 工艺线体关联 + */ + @Override + public List selectProRouteLineList(ProRouteLine proRouteLine) { + return proRouteLineMapper.selectProRouteLineList(proRouteLine); + } + + /** + * 新增工艺线体关联 + * + * @param proRouteLine 工艺线体关联 + * @return 结果 + */ + @Override + public int insertProRouteLine(ProRouteLine proRouteLine) { + Date now = DateUtils.getNowDate(); + if(StringUtils.isNotBlank(proRouteLine.getRouteId())){ + //删除之前的关联关系 + proRouteLineMapper.deleteByRouteId(proRouteLine); + } + if(proRouteLine.getSelectedValues()!=null){ + ProRouteLine proRouteLineDto =null; + for(String lineCode:proRouteLine.getSelectedValues()){ + proRouteLineDto = new ProRouteLine(); + proRouteLineDto.setRecordId(IdUtils.fastSimpleUUID()); + proRouteLineDto.setCreateTime(now); + proRouteLineDto.setCreateBy(SecurityUtils.getUsername()); + proRouteLineDto.setRouteId(proRouteLine.getRouteId()); + proRouteLineDto.setItemCode(lineCode); + proRouteLineMapper.insertProRouteLine(proRouteLineDto); + } + } + //新增关联关系 + return 1; + } + + /** + * 修改工艺线体关联 + * + * @param proRouteLine 工艺线体关联 + * @return 结果 + */ + @Override + public int updateProRouteLine(ProRouteLine proRouteLine) { + proRouteLine.setUpdateTime(DateUtils.getNowDate()); + return proRouteLineMapper.updateProRouteLine(proRouteLine); + } + + /** + * 批量删除工艺线体关联 + * + * @param recordIds 需要删除的工艺线体关联主键 + * @return 结果 + */ + @Override + public int deleteProRouteLineByRecordIds(String[] recordIds) { + return proRouteLineMapper.deleteProRouteLineByRecordIds(recordIds); + } + + /** + * 删除工艺线体关联信息 + * + * @param recordId 工艺线体关联主键 + * @return 结果 + */ + @Override + public int deleteProRouteLineByRecordId(String recordId) { + return proRouteLineMapper.deleteProRouteLineByRecordId(recordId); + } + + @Override + public ProRouteLine getList(ProRouteLine proRouteLine) { + ProRouteLine dto = new ProRouteLine(); + List unSelected= proRouteLineMapper.getRouteProdLineListUndo(proRouteLine); + dto.setUnSelect(unSelected); + List selected= proRouteLineMapper.getRouteProdLineListDo(proRouteLine); + dto.setSelected(selected); + return dto; + } +} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml index e4c7781e..766646ef 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -30,15 +31,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, factory_code, order_type, order_code, prod_code, prod_desc, quantity, quantity_split + select id, plan_factory_code, order_type, order_code, prod_code, prod_desc, quantity, quantity_split unit, worker_order, plan_pro_date, plan_complete, atrr1, atrr2, atrr3, - status, parent_order, create_by, create_time, update_by, update_time, prod_type + status, parent_order, create_by, create_time, update_by, update_time, prod_type, + factory_code from pro_order + + + and route_id = #{routeId} + and item_id = #{itemId} + and item_code = #{itemCode} + and item_name like concat('%', #{itemName}, '%') + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and attr4 = #{attr4} + + + + + + + + + insert into pro_route_line + + record_id, + route_id, + item_id, + item_code, + item_name, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{recordId}, + #{routeId}, + #{itemId}, + #{itemCode}, + #{itemName}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update pro_route_line + + route_id = #{routeId}, + item_id = #{itemId}, + item_code = #{itemCode}, + item_name = #{itemName}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where record_id = #{recordId} + + + + delete from pro_route_line where record_id = #{recordId} + + + + delete from pro_route_line where record_id in + + #{recordId} + + + + delete from pro_route_line where route_id = #{routeId} + + diff --git a/op-modules/op-sap/op-modules-sap.iml b/op-modules/op-sap/op-modules-sap.iml new file mode 100644 index 00000000..98be0bca --- /dev/null +++ b/op-modules/op-sap/op-modules-sap.iml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysUserController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysUserController.java deleted file mode 100644 index 201e10b9..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysUserController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.op.wms.controller; - -import java.io.IOException; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; -import com.op.common.core.domain.R; -import com.op.common.core.utils.StringUtils; -import com.op.common.core.utils.poi.ExcelUtil; -import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.web.page.TableDataInfo; -import com.op.common.log.annotation.Log; -import com.op.common.log.enums.BusinessType; -import com.op.common.security.annotation.InnerAuth; -import com.op.common.security.annotation.RequiresPermissions; -import com.op.common.security.utils.SecurityUtils; -import com.op.system.api.domain.SysDept; -import com.op.system.api.domain.SysRole; -import com.op.system.api.domain.SysUser; -import com.op.system.api.model.LoginUser; -import com.op.wms.service.ISysUserService; - -/** - * 用户信息 - * - * @author OP - */ -@RestController -@RequestMapping("/user") -public class SysUserController extends BaseController { - @Autowired - private ISysUserService userService; - - - /** - * 获取用户列表 - */ - @RequiresPermissions("system:user:list") - @GetMapping("/list") - public TableDataInfo list(SysUser user) { - startPage(); - List list = userService.selectUserList(user); - return getDataTable(list); - } - - @Log(title = "用户管理", businessType = BusinessType.EXPORT) - @RequiresPermissions("system:user:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysUser user) { - List list = userService.selectUserList(user); - ExcelUtil util = new ExcelUtil(SysUser.class); - util.exportExcel(response, list, "用户数据"); - } - - - - @PostMapping("/importTemplate") - public void importTemplate(HttpServletResponse response) throws IOException { - ExcelUtil util = new ExcelUtil(SysUser.class); - util.importTemplateExcel(response, "用户数据"); - } - - - - /** - * 新增用户 - */ - @RequiresPermissions("system:user:add") - @Log(title = "用户管理", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@Validated @RequestBody SysUser user) { - if (!userService.checkUserNameUnique(user)) { - return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); - } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { - return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); - } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { - return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); - } - user.setCreateBy(SecurityUtils.getUsername()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return toAjax(userService.insertUser(user)); - } - - - - /** - * 重置密码 - */ - @RequiresPermissions("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping("/resetPwd") - public AjaxResult resetPwd(@RequestBody SysUser user) { - userService.checkUserAllowed(user); - userService.checkUserDataScope(user.getUserId()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.resetPwd(user)); - } - - /** - * 状态修改 - */ - @RequiresPermissions("system:user:edit") - @Log(title = "用户管理", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysUser user) { - userService.checkUserAllowed(user); - userService.checkUserDataScope(user.getUserId()); - user.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(userService.updateUserStatus(user)); - } - -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysUserRole.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysUserRole.java deleted file mode 100644 index ddfa713a..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysUserRole.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.op.wms.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和角色关联 sys_user_role - * - * @author OP - */ -public class SysUserRole { - /** 用户ID */ - private Long userId; - - /** 角色ID */ - private Long roleId; - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Long getRoleId() { - return roleId; - } - - public void setRoleId(Long roleId) { - this.roleId = roleId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("userId", getUserId()) - .append("roleId", getRoleId()).toString(); - } -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/SysUserMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/SysUserMapper.java deleted file mode 100644 index c8568b65..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/SysUserMapper.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.op.wms.mapper; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import com.op.system.api.domain.SysUser; - -/** - * 用户表 数据层 - * - * @author OP - */ -public interface SysUserMapper { - /** - * 根据条件分页查询用户列表 - * - * @param sysUser 用户信息 - * @return 用户信息集合信息 - */ - public List selectUserList(SysUser sysUser); - - /** - * 根据条件分页查询已配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectAllocatedList(SysUser user); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUnallocatedList(SysUser user); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int insertUser(SysUser user); - - /** - * 修改用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUser(SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); - - /** - * 通过用户ID删除用户 - * - * @param userId 用户ID - * @return 结果 - */ - public int deleteUserById(Long userId); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - public int deleteUserByIds(Long[] userIds); - - /** - * 校验用户名称是否唯一 - * - * @param userName 用户名称 - * @return 结果 - */ - public SysUser checkUserNameUnique(String userName); - - /** - * 校验手机号码是否唯一 - * - * @param phonenumber 手机号码 - * @return 结果 - */ - public SysUser checkPhoneUnique(String phonenumber); - - /** - * 校验email是否唯一 - * - * @param email 用户邮箱 - * @return 结果 - */ - public SysUser checkEmailUnique(String email); -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysUserService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysUserService.java deleted file mode 100644 index 0633dc4c..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysUserService.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.op.wms.service; - -import java.util.List; -import com.op.system.api.domain.SysUser; - -/** - * 用户 业务层 - * - * @author OP - */ -public interface ISysUserService { - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUserList(SysUser user); - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectAllocatedList(SysUser user); - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - public List selectUnallocatedList(SysUser user); - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - public SysUser selectUserByUserName(String userName); - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - public SysUser selectUserById(Long userId); - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean checkUserNameUnique(SysUser user); - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean checkPhoneUnique(SysUser user); - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean checkEmailUnique(SysUser user); - - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - public void checkUserAllowed(SysUser user); - - /** - * 校验用户是否有数据权限 - * - * @param userId 用户id - */ - public void checkUserDataScope(Long userId); - - /** - * 新增用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int insertUser(SysUser user); - - /** - * 注册用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - public boolean registerUser(SysUser user); - - - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUserStatus(SysUser user); - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - public int updateUserProfile(SysUser user); - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - public boolean updateUserAvatar(String userName, String avatar); - - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - public int resetPwd(SysUser user); - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - public int resetUserPwd(String userName, String password); - -} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysUserServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysUserServiceImpl.java deleted file mode 100644 index 8d051f7f..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysUserServiceImpl.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.op.wms.service.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Validator; - - -import com.op.wms.mapper.SysUserMapper; -import com.op.wms.service.ISysUserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import com.op.common.core.constant.UserConstants; -import com.op.common.core.exception.ServiceException; -import com.op.common.core.utils.SpringUtils; -import com.op.common.core.utils.StringUtils; -import com.op.common.core.utils.bean.BeanValidators; -import com.op.common.datascope.annotation.DataScope; -import com.op.common.security.utils.SecurityUtils; -import com.op.system.api.domain.SysRole; -import com.op.system.api.domain.SysUser; - - -/** - * 用户 业务层处理 - * - * @author OP - */ -@Service -public class SysUserServiceImpl implements ISysUserService { - private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - - @Autowired - private SysUserMapper userMapper; - - - @Autowired - protected Validator validator; - - /** - * 根据条件分页查询用户列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUserList(SysUser user) { - return userMapper.selectUserList(user); - } - - /** - * 根据条件分页查询已分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) { - return userMapper.selectAllocatedList(user); - } - - /** - * 根据条件分页查询未分配用户角色列表 - * - * @param user 用户信息 - * @return 用户信息集合信息 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) { - return userMapper.selectUnallocatedList(user); - } - - /** - * 通过用户名查询用户 - * - * @param userName 用户名 - * @return 用户对象信息 - */ - @Override - public SysUser selectUserByUserName(String userName) { - return userMapper.selectUserByUserName(userName); - } - - /** - * 通过用户ID查询用户 - * - * @param userId 用户ID - * @return 用户对象信息 - */ - @Override - public SysUser selectUserById(Long userId) { - return userMapper.selectUserById(userId); - } - - - /** - * 校验用户名称是否唯一 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean checkUserNameUnique(SysUser user) { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkUserNameUnique(user.getUserName()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验手机号码是否唯一 - * - * @param user 用户信息 - * @return - */ - @Override - public boolean checkPhoneUnique(SysUser user) { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验email是否唯一 - * - * @param user 用户信息 - * @return - */ - @Override - public boolean checkEmailUnique(SysUser user) { - Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkEmailUnique(user.getEmail()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 校验用户是否允许操作 - * - * @param user 用户信息 - */ - @Override - public void checkUserAllowed(SysUser user) { - if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) { - throw new ServiceException("不允许操作超级管理员用户"); - } - } - - /** - * 校验用户是否有数据权限 - * - * @param userId 用户id - */ - @Override - public void checkUserDataScope(Long userId) { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) { - SysUser user = new SysUser(); - user.setUserId(userId); - List users = SpringUtils.getAopProxy(this).selectUserList(user); - if (StringUtils.isEmpty(users)) { - throw new ServiceException("没有权限访问用户数据！"); - } - } - } - - /** - * 新增保存用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int insertUser(SysUser user) { - // 新增用户信息 - int rows = userMapper.insertUser(user); - - return rows; - } - - /** - * 注册用户信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public boolean registerUser(SysUser user) { - return userMapper.insertUser(user) > 0; - } - - - /** - * 修改用户状态 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int updateUserStatus(SysUser user) { - return userMapper.updateUser(user); - } - - /** - * 修改用户基本信息 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int updateUserProfile(SysUser user) { - return userMapper.updateUser(user); - } - - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - @Override - public boolean updateUserAvatar(String userName, String avatar) { - return userMapper.updateUserAvatar(userName, avatar) > 0; - } - - /** - * 重置用户密码 - * - * @param user 用户信息 - * @return 结果 - */ - @Override - public int resetPwd(SysUser user) { - return userMapper.updateUser(user); - } - - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - @Override - public int resetUserPwd(String userName, String password) { - return userMapper.resetUserPwd(userName, password); - } - -}