From 11ccd809b2391e6e61b22d530c523ec622e4b866 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 十二月 2024 18:19:52 +0800
Subject: [PATCH] 门店
---
manage/src/main/resources/mapping/SecRoleMapper.xml | 63 ++++
common/src/main/java/com/jilongda/common/component/AliOssFileUploadController.java | 2
manage/src/main/resources/mapping/SecRoleResourceMapper.xml | 4
manage/src/main/resources/mapping/SecUserRoleMapper.xml | 29 +
manage/src/main/java/com/jilongda/manage/authority/service/impl/SecUserServiceImpl.java | 17
manage/src/main/java/com/jilongda/manage/controller/TStoreController.java | 70 +++++
manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java | 87 ------
manage/src/main/java/com/jilongda/manage/mapper/TStoreMapper.java | 13 +
manage/src/main/java/com/jilongda/manage/utils/GoodsImportValidator.java | 33 --
manage/src/main/java/com/jilongda/manage/model/TStore.java | 27 -
manage/src/main/resources/application.yml | 4
/dev/null | 20 -
manage/src/main/resources/mapping/SecUserMapper.xml | 185 ++++++++++++--
manage/src/main/java/com/jilongda/manage/service/impl/TStoreServiceImpl.java | 13 +
manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java | 5
manage/src/main/java/com/jilongda/manage/query/TStoreQuery.java | 17 +
manage/src/main/java/com/jilongda/manage/service/TStoreService.java | 9
manage/src/main/resources/mapping/TStoreMapper.xml | 18 +
manage/src/main/resources/mapping/SecResourcesMapper.xml | 124 +++++++-
manage/src/main/java/com/jilongda/manage/vo/TStoreVO.java | 11
20 files changed, 500 insertions(+), 251 deletions(-)
diff --git a/common/src/main/java/com/jilongda/common/component/AliOssFileUploadController.java b/common/src/main/java/com/jilongda/common/component/AliOssFileUploadController.java
index 29abf8d..49fc08a 100644
--- a/common/src/main/java/com/jilongda/common/component/AliOssFileUploadController.java
+++ b/common/src/main/java/com/jilongda/common/component/AliOssFileUploadController.java
@@ -61,7 +61,7 @@
//传图片一步到位
mf.transferTo(targetFile);
//拼接数据
- return "http://sales.chelota.com/images/" + TimeDir +"/"+ fileName;
+ return "http://eyes.chelota.com/images/" + TimeDir +"/"+ fileName;
}
@ApiOperation(value = "服务端上传", notes = "服务端上传")
@PostMapping(value = "upload")
diff --git a/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java b/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
index fa82bfe..dd2db16 100644
--- a/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
+++ b/manage/src/main/java/com/jilongda/manage/authority/controller/SecUserController.java
@@ -81,19 +81,17 @@
private final PasswordEncoder passwordEncoder;
private final UserUtil userUtil;
private final SecUserRoleService secUserRoleService;
- private final TDeptService deptService;
private final LoginInfoUtil loginInfoUtil;
private final RedisAutoTemplate redisAutoTemplate;
@Autowired
- public SecUserController(SecUserService secUserService, SecRoleService secRoleService, SecResourcesService secResourcesService, PasswordEncoder passwordEncoder, UserUtil userUtil, SecUserRoleService secUserRoleService, TDeptService deptService, LoginInfoUtil loginInfoUtil, RedisAutoTemplate redisAutoTemplate) {
+ public SecUserController(SecUserService secUserService, SecRoleService secRoleService, SecResourcesService secResourcesService, PasswordEncoder passwordEncoder, UserUtil userUtil, SecUserRoleService secUserRoleService, LoginInfoUtil loginInfoUtil, RedisAutoTemplate redisAutoTemplate) {
this.secUserService = secUserService;
this.secRoleService = secRoleService;
this.secResourcesService = secResourcesService;
this.passwordEncoder = passwordEncoder;
this.userUtil = userUtil;
this.secUserRoleService = secUserRoleService;
- this.deptService = deptService;
this.loginInfoUtil = loginInfoUtil;
this.redisAutoTemplate = redisAutoTemplate;
}
@@ -317,89 +315,6 @@
e.printStackTrace();
}
}
- }
-
- /**
- * 人员新增列表
- */
- @ApiOperation(value = "人员新增列表",notes = "type 1=部门,2=用户")
- @GetMapping("/userAddList")
- public ApiResult userAddList(@RequestParam(required = false) String name)
- {
- UserAddListVO userAddListVO = new UserAddListVO();
-
- // 获取当前用户所在部门
- SecUser loginUser = loginInfoUtil.getLoginUser();
- Long deptId = loginUser.getDeptId();
- List<TDept> deptList = new ArrayList<>();
- List<SecUser> userList = new ArrayList<>();
- List<UserLevelVO> userLevelVOS = new ArrayList<>();
- if(!loginUser.isAdmin()){
- userList = secUserService.selectListByNamePhoneDeptId(name,deptId);
- if(CollectionUtils.isEmpty(userList)){
- return ApiResult.success(userAddListVO);
- }
-
- TDept dept = deptService.getById(deptId);
- UserLevelVO userLevelVO = new UserLevelVO();
- List<UserLevelVO> children = new ArrayList<>();
- for (SecUser user : userList) {
- UserLevelVO userLevelVO1 = new UserLevelVO();
- userLevelVO1.setKey(user.getId());
- userLevelVO1.setTitle(user.getNickName());
- userLevelVO1.setAvatar(user.getAvatarUrl());
- userLevelVO1.setFlag(true);
- userLevelVO1.setValue(CodeGenerateUtils.generateVolumeSn());
- children.add(userLevelVO1);
- }
- userLevelVO.setChildren(children);
- userLevelVO.setKey(dept.getId());
- userLevelVO.setTitle(dept.getDeptName());
- userLevelVO.setValue(CodeGenerateUtils.generateVolumeSn());
- userLevelVOS.add(userLevelVO);
- }else {
- // 查询符合要求部门id
- deptList = deptService.userAddListByDeptNameDeptIds(name,null);
- List<Long> deptIds = deptList.stream().map(TDept::getId).collect(Collectors.toList());
- userList = secUserService.selectListByNamePhoneDeptIds(name,null);
- deptIds.addAll(userList.stream().map(SecUser::getDeptId).collect(Collectors.toList()));
- // 查询部门
- deptList = deptService.userAddListByDeptNameDeptIds(null,deptIds);
- if(CollectionUtils.isEmpty(deptList)){
- return ApiResult.success(userAddListVO);
- }
- // 查询用户
- userList = secUserService.selectListByNamePhoneDeptIds(null,deptIds);
-
- for (TDept dept : deptList) {
- List<SecUser> users;
- if(StringUtils.hasLength(name) && !dept.getDeptName().contains(name)){
- users = userList.stream().filter(e -> dept.getId().equals(e.getDeptId())
- && (((StringUtils.hasLength(e.getNickName()) && e.getNickName().contains(name)))
- || (StringUtils.hasLength(e.getPhone()) && e.getPhone().contains(name)))).collect(Collectors.toList());
- }else {
- users = userList.stream().filter(e -> dept.getId().equals(e.getDeptId())).collect(Collectors.toList());
- }
- UserLevelVO userLevelVO = new UserLevelVO();
- List<UserLevelVO> children = new ArrayList<>();
- for (SecUser user : users) {
- UserLevelVO userLevelVO1 = new UserLevelVO();
- userLevelVO1.setKey(user.getId());
- userLevelVO1.setTitle(user.getNickName());
- userLevelVO1.setAvatar(user.getAvatarUrl());
- userLevelVO1.setFlag(true);
- userLevelVO1.setValue(CodeGenerateUtils.generateVolumeSn());
- children.add(userLevelVO1);
- }
- userLevelVO.setChildren(children);
- userLevelVO.setKey(dept.getId());
- userLevelVO.setTitle(dept.getDeptName());
- userLevelVO.setValue(CodeGenerateUtils.generateVolumeSn());
- userLevelVOS.add(userLevelVO);
- }
- }
- userAddListVO.setUserLevelVOS(userLevelVOS);
- return ApiResult.success(userAddListVO);
}
@ApiOperation(value = "用户导入")
diff --git a/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java b/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java
index 2c8b1ea..cfe59d1 100644
--- a/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java
+++ b/manage/src/main/java/com/jilongda/manage/authority/model/SecUser.java
@@ -103,7 +103,7 @@
@TableField("deptId")
private Long deptId;
- @ApiModelProperty(value = "用户类型 1=总经理，2=销售总监，3=客户经理")
+ @ApiModelProperty(value = "用户类型 1=平台管理员，2=验光师")
@TableField("userType")
private Integer userType;
@ApiModelProperty(value = "省code")
@@ -115,9 +115,6 @@
@ApiModelProperty(value = "区code")
@TableField("areaCode")
private String areaCode;
- @ApiModelProperty(value = "1平台2销售员")
- @TableField("roleType")
- private Integer roleType;
public boolean isAdmin()
{
diff --git a/manage/src/main/java/com/jilongda/manage/authority/service/impl/SecUserServiceImpl.java b/manage/src/main/java/com/jilongda/manage/authority/service/impl/SecUserServiceImpl.java
index f84a25f..b0f01ce 100644
--- a/manage/src/main/java/com/jilongda/manage/authority/service/impl/SecUserServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/authority/service/impl/SecUserServiceImpl.java
@@ -56,8 +56,6 @@
private PasswordEncoder passwordEncoder;
@Autowired
private SecRoleMapper secRoleMapper;
- @Autowired
- private TDeptMapper deptMapper;
@Override
public List<SecResourceVO> selectUserResourcesTag(Long uid) {
@@ -148,15 +146,14 @@
List<SecUsersVO> sysUserListVOS = secUserMapper.getSecUserList(dto, pageInfo);
List<SecRole> secRoles = secRoleMapper.selectList(Wrappers.lambdaQuery(SecRole.class));
- List<TDept> tDepts = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));
- for (SecUsersVO sysUserListVO : sysUserListVOS) {
- List<SecRole> roles = secRoles.stream().filter(role -> Objects.nonNull(sysUserListVO.getRoleId()) && sysUserListVO.getRoleId().equals(role.getId())).collect(toList());
- sysUserListVO.setSecRole(CollectionUtils.isNotEmpty(roles) ? roles.get(0) : null);
- tDepts.stream().filter(dept -> Objects.nonNull(sysUserListVO.getDeptId()) && sysUserListVO.getDeptId().equals(dept.getId())).forEach(dept -> {
- sysUserListVO.setDeptName(dept.getDeptName());
- });
- }
+// for (SecUsersVO sysUserListVO : sysUserListVOS) {
+// List<SecRole> roles = secRoles.stream().filter(role -> Objects.nonNull(sysUserListVO.getRoleId()) && sysUserListVO.getRoleId().equals(role.getId())).collect(toList());
+// sysUserListVO.setSecRole(CollectionUtils.isNotEmpty(roles) ? roles.get(0) : null);
+// tDepts.stream().filter(dept -> Objects.nonNull(sysUserListVO.getDeptId()) && sysUserListVO.getDeptId().equals(dept.getId())).forEach(dept -> {
+// sysUserListVO.setDeptName(dept.getDeptName());
+// });
+// }
pageInfo.setRecords(sysUserListVOS);
// 获取列表
return pageInfo;
diff --git a/manage/src/main/java/com/jilongda/manage/controller/SecResourcesController.java b/manage/src/main/java/com/jilongda/manage/controller/SecResourcesController.java
deleted file mode 100644
index 5cc6f60..0000000
--- a/manage/src/main/java/com/jilongda/manage/controller/SecResourcesController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 资源表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/sec-resources")
-public class SecResourcesController {
-
-}
-
diff --git a/manage/src/main/java/com/jilongda/manage/controller/SecRoleController.java b/manage/src/main/java/com/jilongda/manage/controller/SecRoleController.java
deleted file mode 100644
index dd1207d..0000000
--- a/manage/src/main/java/com/jilongda/manage/controller/SecRoleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/sec-role")
-public class SecRoleController {
-
-}
-
diff --git a/manage/src/main/java/com/jilongda/manage/controller/SecRoleResourceController.java b/manage/src/main/java/com/jilongda/manage/controller/SecRoleResourceController.java
deleted file mode 100644
index 90a3597..0000000
--- a/manage/src/main/java/com/jilongda/manage/controller/SecRoleResourceController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/sec-role-resource")
-public class SecRoleResourceController {
-
-}
-
diff --git a/manage/src/main/java/com/jilongda/manage/controller/SecUserController.java b/manage/src/main/java/com/jilongda/manage/controller/SecUserController.java
deleted file mode 100644
index 15f3def..0000000
--- a/manage/src/main/java/com/jilongda/manage/controller/SecUserController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/sec-user")
-public class SecUserController {
-
-}
-
diff --git a/manage/src/main/java/com/jilongda/manage/controller/SecUserRoleController.java b/manage/src/main/java/com/jilongda/manage/controller/SecUserRoleController.java
deleted file mode 100644
index ded594f..0000000
--- a/manage/src/main/java/com/jilongda/manage/controller/SecUserRoleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/sec-user-role")
-public class SecUserRoleController {
-
-}
-
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java b/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
index 75d1242..b72afe0 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
@@ -1,9 +1,21 @@
package com.jilongda.manage.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.jilongda.common.basic.ApiResult;
+import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.model.TStore;
+import com.jilongda.manage.query.TStoreQuery;
+import com.jilongda.manage.service.TStoreService;
+import com.jilongda.manage.utils.LoginInfoUtil;
+import com.jilongda.manage.vo.TStoreVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -13,9 +25,63 @@
* @author 无关风月
* @since 2024-12-09
*/
+@Api(tags = "门店管理")
@RestController
@RequestMapping("/t-store")
public class TStoreController {
+ @Autowired
+ private TStoreService storeService;
+ @Autowired
+ private LoginInfoUtil loginInfoUtil;
+
+ /**
+ * 获取门店列表
+ */
+ @ApiOperation(value = "获取门店分页列表")
+ @PostMapping(value = "/pageList")
+ public ApiResult<PageInfo<TStoreVO>> pageList(@RequestBody TStoreQuery query) {
+ Integer userType = loginInfoUtil.getLoginUser().getUserType();
+ if(Objects.equals(userType,2)){
+ query.setStatus(1);
+ }
+ return ApiResult.success(storeService.pageList(query));
+ }
+
+ /**
+ * 添加门店
+ */
+ @ApiOperation(value = "添加门店")
+ @PostMapping(value = "/add")
+ public ApiResult<String> add(@Validated @RequestBody TStore dto) {
+ storeService.save(dto);
+ return ApiResult.success();
+ }
+
+ @ApiOperation(value = "修改门店")
+ @PostMapping(value = "/update")
+ public ApiResult<String> update(@Validated @RequestBody TStore dto) {
+ storeService.updateById(dto);
+ return ApiResult.success();
+ }
+
+ @ApiOperation(value = "删除门店")
+ @DeleteMapping(value = "/deleteById")
+ public ApiResult<Boolean> deleteById(@RequestParam Long id) {
+ return ApiResult.success(storeService.removeById(id));
+ }
+
+ @ApiOperation(value = "批量删除门店")
+ @DeleteMapping(value = "/deleteByIds")
+ public ApiResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
+ return ApiResult.success(storeService.removeByIds(ids));
+ }
+
+ @ApiOperation(value = "查询门店详情")
+ @GetMapping(value = "/getDetailById")
+ public ApiResult<TStore> getDetailById(@RequestParam Long id) {
+ return ApiResult.success(storeService.getById(id));
+ }
+
}
diff --git a/manage/src/main/java/com/jilongda/manage/dto/TDeptDTO.java b/manage/src/main/java/com/jilongda/manage/dto/TDeptDTO.java
deleted file mode 100644
index 0d85dfc..0000000
--- a/manage/src/main/java/com/jilongda/manage/dto/TDeptDTO.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.jilongda.manage.dto;
-
-import com.jilongda.common.model.TDept;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-@ApiModel(value = "部门DTO")
-@Data
-public class TDeptDTO extends TDept {
-
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/dto/TGoodsDTO.java b/manage/src/main/java/com/jilongda/manage/dto/TGoodsDTO.java
deleted file mode 100644
index 89a27ea..0000000
--- a/manage/src/main/java/com/jilongda/manage/dto/TGoodsDTO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.jilongda.manage.dto;
-
-import com.jilongda.common.model.TGoods;
-import com.jilongda.common.model.TGoodsSpecifications;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value = "产品DTO")
-public class TGoodsDTO extends TGoods {
-
- @ApiModelProperty(value = "产品规格集合")
- private List<TGoodsSpecifications> goodsSpecifications;
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/SecResourcesMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/SecResourcesMapper.java
deleted file mode 100644
index 6ea5460..0000000
--- a/manage/src/main/java/com/jilongda/manage/mapper/SecResourcesMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.mapper;
-
-import com.jilongda.manage.model.SecResources;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 资源表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecResourcesMapper extends BaseMapper<SecResources> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/SecRoleMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/SecRoleMapper.java
deleted file mode 100644
index f00f549..0000000
--- a/manage/src/main/java/com/jilongda/manage/mapper/SecRoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.mapper;
-
-import com.jilongda.manage.model.SecRole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecRoleMapper extends BaseMapper<SecRole> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/SecRoleResourceMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/SecRoleResourceMapper.java
deleted file mode 100644
index da5ee4c..0000000
--- a/manage/src/main/java/com/jilongda/manage/mapper/SecRoleResourceMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.mapper;
-
-import com.jilongda.manage.model.SecRoleResource;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecRoleResourceMapper extends BaseMapper<SecRoleResource> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/SecUserMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/SecUserMapper.java
deleted file mode 100644
index 78de909..0000000
--- a/manage/src/main/java/com/jilongda/manage/mapper/SecUserMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.mapper;
-
-import com.jilongda.manage.model.SecUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecUserMapper extends BaseMapper<SecUser> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/SecUserRoleMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/SecUserRoleMapper.java
deleted file mode 100644
index 44a189f..0000000
--- a/manage/src/main/java/com/jilongda/manage/mapper/SecUserRoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.mapper;
-
-import com.jilongda.manage.model.SecUserRole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecUserRoleMapper extends BaseMapper<SecUserRole> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/TStoreMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/TStoreMapper.java
index 7428f5f..4d05acc 100644
--- a/manage/src/main/java/com/jilongda/manage/mapper/TStoreMapper.java
+++ b/manage/src/main/java/com/jilongda/manage/mapper/TStoreMapper.java
@@ -1,7 +1,13 @@
package com.jilongda.manage.mapper;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TStore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jilongda.manage.query.TStoreQuery;
+import com.jilongda.manage.vo.TStoreVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +19,11 @@
*/
public interface TStoreMapper extends BaseMapper<TStore> {
+ /**
+ * 获取门店分页列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TStoreVO> pageList(@Param("query") TStoreQuery query, @Param("pageInfo")PageInfo<TStoreVO> pageInfo);
}
diff --git a/manage/src/main/java/com/jilongda/manage/model/TStore.java b/manage/src/main/java/com/jilongda/manage/model/TStore.java
index 82417b4..00ae66e 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TStore.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TStore.java
@@ -6,6 +6,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.jilongda.common.pojo.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_store")
@ApiModel(value="TStore对象", description="门店表")
-public class TStore implements Serializable {
+public class TStore extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -61,25 +63,7 @@
@ApiModelProperty(value = "地址")
@TableField("address")
- private Integer address;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @TableField("createBy")
- private String createBy;
-
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0否1是")
- @TableField("isDelete")
- private Integer isDelete;
+ private String address;
@ApiModelProperty(value = "经度")
@TableField("lon")
@@ -92,6 +76,9 @@
@ApiModelProperty(value = "照片")
@TableField("img")
private String img;
+ @ApiModelProperty(value = "状态 1=启用 2=禁用")
+ @TableField("status")
+ private Integer status;
}
diff --git a/manage/src/main/java/com/jilongda/manage/query/TStoreQuery.java b/manage/src/main/java/com/jilongda/manage/query/TStoreQuery.java
new file mode 100644
index 0000000..5936412
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/query/TStoreQuery.java
@@ -0,0 +1,17 @@
+package com.jilongda.manage.query;
+
+import com.jilongda.common.pojo.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "门店查询参数")
+public class TStoreQuery extends BasePage {
+
+ @ApiModelProperty(value = "门店名称")
+ private String name;
+ @ApiModelProperty(value = "状态 1=启用 2=禁用")
+ private Integer status;
+
+}
diff --git a/manage/src/main/java/com/jilongda/manage/service/SecResourcesService.java b/manage/src/main/java/com/jilongda/manage/service/SecResourcesService.java
deleted file mode 100644
index ddd2e18..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/SecResourcesService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.service;
-
-import com.jilongda.manage.model.SecResources;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 资源表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecResourcesService extends IService<SecResources> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/SecRoleResourceService.java b/manage/src/main/java/com/jilongda/manage/service/SecRoleResourceService.java
deleted file mode 100644
index c3d32c6..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/SecRoleResourceService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.service;
-
-import com.jilongda.manage.model.SecRoleResource;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecRoleResourceService extends IService<SecRoleResource> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/SecRoleService.java b/manage/src/main/java/com/jilongda/manage/service/SecRoleService.java
deleted file mode 100644
index 3207edd..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/SecRoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.service;
-
-import com.jilongda.manage.model.SecRole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecRoleService extends IService<SecRole> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/SecUserRoleService.java b/manage/src/main/java/com/jilongda/manage/service/SecUserRoleService.java
deleted file mode 100644
index edcc5ae..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/SecUserRoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.service;
-
-import com.jilongda.manage.model.SecUserRole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecUserRoleService extends IService<SecUserRole> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/SecUserService.java b/manage/src/main/java/com/jilongda/manage/service/SecUserService.java
deleted file mode 100644
index 39afe45..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/SecUserService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jilongda.manage.service;
-
-import com.jilongda.manage.model.SecUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-public interface SecUserService extends IService<SecUser> {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/TStoreService.java b/manage/src/main/java/com/jilongda/manage/service/TStoreService.java
index 7b66188..da676c9 100644
--- a/manage/src/main/java/com/jilongda/manage/service/TStoreService.java
+++ b/manage/src/main/java/com/jilongda/manage/service/TStoreService.java
@@ -1,7 +1,10 @@
package com.jilongda.manage.service;
+import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TStore;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.jilongda.manage.query.TStoreQuery;
+import com.jilongda.manage.vo.TStoreVO;
/**
* <p>
@@ -13,4 +16,10 @@
*/
public interface TStoreService extends IService<TStore> {
+ /**
+ * 获取门店分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TStoreVO> pageList(TStoreQuery query);
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/SecResourcesServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/SecResourcesServiceImpl.java
deleted file mode 100644
index d621eae..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/impl/SecResourcesServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.manage.service.impl;
-
-import com.jilongda.manage.model.SecResources;
-import com.jilongda.manage.mapper.SecResourcesMapper;
-import com.jilongda.manage.service.SecResourcesService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 资源表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Service
-public class SecResourcesServiceImpl extends ServiceImpl<SecResourcesMapper, SecResources> implements SecResourcesService {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/SecRoleResourceServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/SecRoleResourceServiceImpl.java
deleted file mode 100644
index 98c8f66..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/impl/SecRoleResourceServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.manage.service.impl;
-
-import com.jilongda.manage.model.SecRoleResource;
-import com.jilongda.manage.mapper.SecRoleResourceMapper;
-import com.jilongda.manage.service.SecRoleResourceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Service
-public class SecRoleResourceServiceImpl extends ServiceImpl<SecRoleResourceMapper, SecRoleResource> implements SecRoleResourceService {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/SecRoleServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/SecRoleServiceImpl.java
deleted file mode 100644
index 07d0f71..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/impl/SecRoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.manage.service.impl;
-
-import com.jilongda.manage.model.SecRole;
-import com.jilongda.manage.mapper.SecRoleMapper;
-import com.jilongda.manage.service.SecRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Service
-public class SecRoleServiceImpl extends ServiceImpl<SecRoleMapper, SecRole> implements SecRoleService {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/SecUserRoleServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/SecUserRoleServiceImpl.java
deleted file mode 100644
index 5a9a25e..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/impl/SecUserRoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.manage.service.impl;
-
-import com.jilongda.manage.model.SecUserRole;
-import com.jilongda.manage.mapper.SecUserRoleMapper;
-import com.jilongda.manage.service.SecUserRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Service
-public class SecUserRoleServiceImpl extends ServiceImpl<SecUserRoleMapper, SecUserRole> implements SecUserRoleService {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/SecUserServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/SecUserServiceImpl.java
deleted file mode 100644
index fcb1bd2..0000000
--- a/manage/src/main/java/com/jilongda/manage/service/impl/SecUserServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.manage.service.impl;
-
-import com.jilongda.manage.model.SecUser;
-import com.jilongda.manage.mapper.SecUserMapper;
-import com.jilongda.manage.service.SecUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Service
-public class SecUserServiceImpl extends ServiceImpl<SecUserMapper, SecUser> implements SecUserService {
-
-}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TStoreServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TStoreServiceImpl.java
index 5464f1b..77955d4 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TStoreServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TStoreServiceImpl.java
@@ -1,10 +1,16 @@
package com.jilongda.manage.service.impl;
+import com.jilongda.common.basic.PageInfo;
+import com.jilongda.common.model.TCustomers;
import com.jilongda.manage.model.TStore;
import com.jilongda.manage.mapper.TStoreMapper;
+import com.jilongda.manage.query.TStoreQuery;
import com.jilongda.manage.service.TStoreService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jilongda.manage.vo.TStoreVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +23,11 @@
@Service
public class TStoreServiceImpl extends ServiceImpl<TStoreMapper, TStore> implements TStoreService {
+ @Override
+ public PageInfo<TStoreVO> pageList(TStoreQuery query) {
+ PageInfo<TStoreVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TStoreVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/manage/src/main/java/com/jilongda/manage/utils/GoodsImportValidator.java b/manage/src/main/java/com/jilongda/manage/utils/GoodsImportValidator.java
index 7003684..2bc5227 100644
--- a/manage/src/main/java/com/jilongda/manage/utils/GoodsImportValidator.java
+++ b/manage/src/main/java/com/jilongda/manage/utils/GoodsImportValidator.java
@@ -8,16 +8,6 @@
@Slf4j
public class GoodsImportValidator {
- public static boolean validateGoods(TGoodsImportExcels goodsImportExcel) {
- try {
- return !isValidGoods(goodsImportExcel);
- } catch (Exception e) {
- // 记录日志，提供详细的错误信息
- log.error("Validation error in GoodsImportExcel: {}", e.getMessage());
- // 可以根据具体情况决定是否需要抛出异常或如何处理这些异常
- throw e;
- }
- }
public static boolean validateCustomers(TCustomers customers) {
try {
return !isValidCustomers(customers);
@@ -27,29 +17,6 @@
// 可以根据具体情况决定是否需要抛出异常或如何处理这些异常
throw e;
}
- }
-
- /**
- * 校验商品导入Excel数据
- *
- * @param goodsImportExcel 商品导入Excel数据
- * @return 校验结果
- */
- private static boolean isValidGoods(TGoodsImportExcels goodsImportExcel) {
- return hasLength(goodsImportExcel.getGoodsName())
- && hasLength(goodsImportExcel.getGoodsNo())
- && hasLength(goodsImportExcel.getGoodsBrand())
- && hasLength(goodsImportExcel.getGoodsNature())
- && hasLength(goodsImportExcel.getGoodsType())
- && hasLength(goodsImportExcel.getGoodsRemark())
- && isNotNullAndNonNegative(goodsImportExcel.getGoodsDosage())
- && hasLength(goodsImportExcel.getGoodsContent())
- && hasLength(goodsImportExcel.getGoodsSpecifications())
- && hasLength(goodsImportExcel.getWarehouse())
- && isNotNull(goodsImportExcel.getGeneralManagerPrice())
- && isNotNull(goodsImportExcel.getSalesDirector())
- && isNotNull(goodsImportExcel.getAccountManager())
- && hasLength(goodsImportExcel.getUserPhones());
}
/**
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TStoreVO.java b/manage/src/main/java/com/jilongda/manage/vo/TStoreVO.java
new file mode 100644
index 0000000..f53af90
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/vo/TStoreVO.java
@@ -0,0 +1,11 @@
+package com.jilongda.manage.vo;
+
+import com.jilongda.common.pojo.BasePage;
+import com.jilongda.manage.model.TStore;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "门店管理分页显示")
+public class TStoreVO extends TStore {
+}
diff --git a/manage/src/main/resources/application.yml b/manage/src/main/resources/application.yml
index 9ba53ba..b30b702 100644
--- a/manage/src/main/resources/application.yml
+++ b/manage/src/main/resources/application.yml
@@ -2,8 +2,8 @@
port: 9090
tomcat:
max-swallow-size: 500MB
- servlet:
- context-path: /api
+# servlet:
+# context-path: /api
spring:
thymeleaf:
cache: false
diff --git a/manage/src/main/resources/mapping/SecResourcesMapper.xml b/manage/src/main/resources/mapping/SecResourcesMapper.xml
index 3319458..22ff095 100644
--- a/manage/src/main/resources/mapping/SecResourcesMapper.xml
+++ b/manage/src/main/resources/mapping/SecResourcesMapper.xml
@@ -1,35 +1,109 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jilongda.manage.mapper.SecResourcesMapper">
-
+<mapper namespace="com.jilongda.manage.authority.mapper.SecResourcesMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.jilongda.manage.model.SecResources">
- <id column="id" property="id" />
- <result column="parent_id" property="parentId" />
- <result column="title" property="title" />
- <result column="descriptions" property="descriptions" />
- <result column="sort" property="sort" />
- <result column="icon" property="icon" />
- <result column="name" property="name" />
- <result column="menu" property="menu" />
- <result column="component" property="component" />
- <result column="permit" property="permit" />
- <result column="cate" property="cate" />
- <result column="type" property="type" />
- <result column="hidden" property="hidden" />
- <result column="env_port" property="envPort" />
- <result column="path" property="path" />
- <result column="api_url" property="apiUrl" />
- <result column="createBy" property="createBy" />
- <result column="createTime" property="createTime" />
- <result column="updateBy" property="updateBy" />
- <result column="updateTime" property="updateTime" />
- <result column="isDelete" property="isDelete" />
+ <resultMap id="BaseResultMap" type="com.jilongda.manage.authority.model.SecResources">
+ <id column="id" property="id"/>
+ <result column="createBy" property="createBy"/>
+ <result column="createTime" property="createTime"/>
+ <result column="updateBy" property="updateBy"/>
+ <result column="updateTime" property="updateTime"/>
+ <result column="isDelete" property="isDelete"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="title" property="title"/>
+ <result column="descriptions" property="descriptions"/>
+ <result column="sort" property="sort"/>
+ <result column="icon" property="icon"/>
+ <result column="name" property="name"/>
+ <result column="menu" property="menu"/>
+ <result column="component" property="component"/>
+ <result column="permit" property="permit"/>
+ <result column="cate" property="cate"/>
+ <result column="type" property="type"/>
+ <result column="hidden" property="hidden"/>
+ <result column="env_port" property="envPort"/>
+ <result column="path" property="path"/>
+ <result column="api_url" property="apiUrl"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, parent_id, title, descriptions, sort, icon, name, menu, component, permit, cate, type, hidden, env_port, path, api_url, createBy, createTime, updateBy, updateTime, isDelete
+ createBy
+ ,
+ createTime,
+ updateBy,
+ updateTime,
+ isDelete,
+ id, parent_id, title, descriptions, sort, icon, `name`, menu, component, permit, cate, `type`, hidden, env_port, `path`, api_url
</sql>
+ <sql id="Base_Column_List_By_Uid">
+ re.id, re.parent_id, title, re.descriptions, re.sort, re.icon, re.name, re.menu, re.component, re.permit,
+ re.cate, re.type, re.hidden, re.env_port, re.path, re.api_url,
+ re.isDelete, re.createTime, re.updateTime
+ </sql>
+
+ <select id="selectResourceByUid" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List_By_Uid"/>
+ from sec_user_role ur left join sec_role sr on ur.role_id = sr.id
+ left join sec_role_resource rr on sr.id = rr.role_id
+ left join sec_resources re on rr.resource_id = re.id
+ where
+ ur.user_id = #{uid,jdbcType=INTEGER}
+ AND re.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ ORDER BY re.sort
+ </select>
+
+ <select id="getList" resultType="com.jilongda.manage.authority.vo.SecResourceVO">
+ select sr.createBy,
+ sr.createTime,
+ sr.updateBy,
+ sr.updateTime,
+ sr.isDelete,
+ sr.id,
+ sr.parent_id,
+ sr.title,
+ sr.descriptions,
+ sr.sort,
+ sr.icon,
+ sr.name,
+ sr.menu,
+ sr.component,
+ sr.permit,
+ sr.cate,
+ sr.type,
+ sr.hidden,
+ sr.env_port,
+ sr.path,
+ sr.api_url
+ from sec_role_resource srr
+ left join sec_resources sr on srr.resource_id = sr.id
+ where srr.role_id = #{rid,jdbcType=VARCHAR}
+ </select>
+ <select id="allList" resultType="com.jilongda.manage.authority.vo.SecResourceVO">
+ select createBy,
+ createTime,
+ updateBy,
+ updateTime,
+ isDelete,
+ id,
+ parent_id AS parentId,
+ title,
+ descriptions,
+ sort,
+ icon,
+ `name`,
+ menu,
+ component,
+ permit,
+ cate,
+ `type`,
+ hidden,
+ env_port AS envPort,
+ `path`,
+ api_url AS apiUrl
+ from sec_resources
+ ORDER BY parent_id
+ </select>
</mapper>
diff --git a/manage/src/main/resources/mapping/SecRoleMapper.xml b/manage/src/main/resources/mapping/SecRoleMapper.xml
index 8935a53..d97cf61 100644
--- a/manage/src/main/resources/mapping/SecRoleMapper.xml
+++ b/manage/src/main/resources/mapping/SecRoleMapper.xml
@@ -1,24 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jilongda.manage.mapper.SecRoleMapper">
+<mapper namespace="com.jilongda.manage.authority.mapper.SecRoleMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.jilongda.manage.model.SecRole">
+ <resultMap id="BaseResultMap" type="com.jilongda.manage.authority.model.SecRole">
<id column="id" property="id" />
+ <result column="createBy" property="createBy"/>
+ <result column="createTime" property="createTime"/>
+ <result column="updateBy" property="updateBy"/>
+ <result column="updateTime" property="updateTime"/>
+ <result column="isDelete" property="isDelete"/>
<result column="rolename" property="rolename" />
<result column="role_desc" property="roleDesc" />
<result column="role_state" property="roleState" />
- <result column="createBy" property="createBy" />
- <result column="createTime" property="createTime" />
- <result column="updateBy" property="updateBy" />
- <result column="updateTime" property="updateTime" />
- <result column="isDelete" property="isDelete" />
<result column="sortBy" property="sortBy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, rolename, role_desc, role_state, createBy, createTime, updateBy, updateTime, isDelete, sortBy
+ createBy,
+ createTime,
+ updateBy,
+ updateTime,
+ isDelete,
+ id, rolename, role_desc, role_state
</sql>
+ <!--根据用户id查询所有集合-->
+ <select id="selectRolesByUid" resultMap="BaseResultMap">
+ select
+ r.createBy,
+ r.createTime,
+ r.updateBy,
+ r.updateTime,
+ r.isDelete,
+ r.id, r.rolename, r.role_desc AS roleDesc, r.role_state AS roleState,r.sortBy
+ from sec_role r,sec_user_role u
+ <where>
+ r.id = u.role_id
+ and u.user_id = #{uid,jdbcType=INTEGER}
+ and r.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ ORDER BY r.sortBy DESC
+ </where>
+ </select>
+ <!--通过角色查找人员-->
+ <select id="getUserByRole" resultType="com.jilongda.manage.authority.vo.SecUserVO">
+ SELECT sr.id AS roleId,su.id AS userId,su.account
+ FROM sec_role sr
+ LEFT JOIN sec_user_role sur ON sr.id = sur.role_id
+ LEFT JOIN sec_user su ON sur.user_id = su.id
+ <where>
+ <if test="dto.id != null">
+ sr.id = #{dto.id}
+ </if>
+ and sr.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ </select>
+
+ <select id="selectResByRid" resultType="java.lang.Long">
+ SELECT
+ resource_id
+ FROM sec_resources r,sec_role_resource srr
+ <where>
+ r.id = srr.resource_id
+ AND srr.role_id = #{rid,jdbcType=INTEGER}
+ AND r.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ GROUP BY r.id
+ </where>
+ </select>
</mapper>
diff --git a/manage/src/main/resources/mapping/SecRoleResourceMapper.xml b/manage/src/main/resources/mapping/SecRoleResourceMapper.xml
index 83b48a3..77c534d 100644
--- a/manage/src/main/resources/mapping/SecRoleResourceMapper.xml
+++ b/manage/src/main/resources/mapping/SecRoleResourceMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jilongda.manage.mapper.SecRoleResourceMapper">
+<mapper namespace="com.jilongda.manage.authority.mapper.SecRoleResourceMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.jilongda.manage.model.SecRoleResource">
+ <resultMap id="BaseResultMap" type="com.jilongda.manage.authority.model.SecRoleResource">
<result column="role_id" property="roleId" />
<result column="resource_id" property="resourceId" />
</resultMap>
diff --git a/manage/src/main/resources/mapping/SecUserMapper.xml b/manage/src/main/resources/mapping/SecUserMapper.xml
index f6e04f9..634b301 100644
--- a/manage/src/main/resources/mapping/SecUserMapper.xml
+++ b/manage/src/main/resources/mapping/SecUserMapper.xml
@@ -1,39 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jilongda.manage.mapper.SecUserMapper">
-
+<mapper namespace="com.jilongda.manage.authority.mapper.SecUserMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.jilongda.manage.model.SecUser">
- <id column="id" property="id" />
- <result column="account" property="account" />
- <result column="description" property="description" />
- <result column="password" property="password" />
- <result column="phone" property="phone" />
- <result column="state" property="state" />
- <result column="last_login_time" property="lastLoginTime" />
- <result column="createBy" property="createBy" />
- <result column="createTime" property="createTime" />
- <result column="updateBy" property="updateBy" />
- <result column="updateTime" property="updateTime" />
- <result column="isDelete" property="isDelete" />
- <result column="nick_name" property="nickName" />
- <result column="avatar_url" property="avatarUrl" />
- <result column="province" property="province" />
- <result column="city" property="city" />
- <result column="area" property="area" />
- <result column="address" property="address" />
- <result column="birthday" property="birthday" />
- <result column="gender" property="gender" />
- <result column="deptId" property="deptId" />
- <result column="userType" property="userType" />
- <result column="provinceCode" property="provinceCode" />
- <result column="cityCode" property="cityCode" />
- <result column="areaCode" property="areaCode" />
+ <resultMap id="BaseResultMap" type="com.jilongda.manage.authority.model.SecUser">
+ <id column="id" property="id"/>
+ <result column="createBy" property="createBy"/>
+ <result column="createTime" property="createTime"/>
+ <result column="updateBy" property="updateBy"/>
+ <result column="updateTime" property="updateTime"/>
+ <result column="isDelete" property="isDelete"/>
+ <result column="account" property="account"/>
+ <result column="description" property="description"/>
+ <result column="password" property="password"/>
+ <result column="phone" property="phone"/>
+ <result column="state" property="state"/>
+ <result column="last_login_time" property="lastLoginTime"/>
+ <result column="nick_name" property="nickName"/>
+ <result column="avatar_url" property="avatarUrl"/>
+ <result column="province" property="province"/>
+ <result column="city" property="city"/>
+ <result column="area" property="area"/>
+ <result column="address" property="address"/>
+ <result column="birthday" property="birthday"/>
+ <result column="gender" property="gender"/>
+ <result column="deptId" property="deptId"/>
+ <result column="userType" property="userType"/>
+ <result column="provinceCode" property="provinceCode"/>
+ <result column="cityCode" property="cityCode"/>
+ <result column="areaCode" property="areaCode"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, account, description, password, phone, state, last_login_time, createBy, createTime, updateBy, updateTime, isDelete, nick_name, avatar_url, province, city, area, address, birthday, gender, deptId, userType, provinceCode, cityCode, areaCode
+ createBy
+ ,
+ createTime,
+ updateBy,
+ updateTime,
+ isDelete,
+ id, account, description, password, phone, `state`, last_login_time AS lastLoginTime,
+ nick_name AS nickName, avatar_url AS avatarUrl, province, city, area, address, birthday, gender,deptId,userType,
+ provinceCode, cityCode, areaCode
</sql>
+ <sql id="Base_Column_List_Other">
+ su.createBy,
+ su.createTime,
+ su.updateBy,
+ su.updateTime,
+ su.isDelete,
+ su.id, su.account, su.description, su.password, su.phone, su.`state`, su.last_login_time AS lastLoginTime,
+ su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address, su.birthday, su.gender,su.deptId,su.userType,
+ su.provinceCode, su.cityCode, su.areaCode
+ </sql>
+
+ <select id="getSecUserList" resultType="com.jilongda.manage.authority.vo.SecUsersVO">
+ SELECT
+ su.createBy,
+ su.createTime,
+ su.updateBy,
+ su.updateTime,
+ su.isDelete,
+ su.id,
+ su.`account`,
+ su.`description`,
+ su.`password`,
+ su.phone,
+ su.state,
+ su.roleType,
+ su.last_login_time AS lastLoginTime, su.nick_name AS nickName, su.avatar_url AS avatarUrl, su.province, su.city, su.area, su.address,
+ su.birthday, su.gender,sr.id AS roleId,sr.rolename AS rolename,su.deptId,su.userType,su.provinceCode, su.cityCode, su.areaCode,td.deptName
+ FROM sec_user su
+ LEFT JOIN sec_user_role sur ON su.id = sur.user_id
+ LEFT JOIN sec_role sr ON sur.role_id = sr.id
+ LEFT JOIN t_dept td ON su.deptId = td.id
+ <where>
+ <if test="dto.account != null and dto.account != ''">
+ AND su.account LIKE concat('%', #{dto.account,jdbcType=VARCHAR}, '%')
+ </if>
+ <if test="dto.nickName != null and dto.nickName != ''">
+ AND su.nick_name LIKE concat('%', #{dto.nickName,jdbcType=VARCHAR}, '%')
+ </if>
+ <if test="dto.phone != null and dto.phone != ''">
+ AND su.phone LIKE concat('%', #{dto.phone,jdbcType=VARCHAR}, '%')
+ </if>
+ <if test="dto.rolename != null and dto.rolename != ''">
+ AND sr.rolename LIKE concat('%', #{dto.rolename,jdbcType=VARCHAR}, '%')
+ </if>
+ <if test="dto.state != null">
+ AND su.state = #{dto.state}
+ </if>
+ AND su.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY su.createTime DESC
+ </select>
+
+ <select id="queryLower" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List">
+ </include>
+ from sec_user
+ <where>
+ <if test="query.userType != null and query.userType == 6">
+ AND user_type = #{query.userType}
+ and personnel_structure_id like concat('%','DR','%')
+ </if>
+ <if test="query.userType != null and query.userType == 7">
+ AND user_type = #{query.userType}
+ and personnel_structure_id like concat('%','HC','%')
+ </if>
+ AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ </select>
+ <select id="getUserByRoleId" resultType="com.jilongda.manage.authority.model.SecUser">
+ select <include refid="Base_Column_List_Other"></include>
+ from sec_user_role sur
+ left join sec_user su on sur.user_id = su.id
+ where sur.role_id = #{id,jdbcType=VARCHAR}
+ and su.id is not null
+ </select>
+
+ <select id="selectListByNamePhoneDeptId" resultType="com.jilongda.manage.authority.model.SecUser">
+ select <include refid="Base_Column_List"></include>
+ from sec_user
+ WHERE isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ <if test="name != null and name != ''">
+ AND (nick_name LIKE concat('%',#{name},'%')
+ OR phone LIKE concat('%',#{name},'%'))
+ </if>
+ <if test="deptId != null">
+ AND deptId = #{deptId}
+ </if>
+ </select>
+
+ <select id="selectListByNamePhoneDeptIds" resultType="com.jilongda.manage.authority.model.SecUser">
+ select <include refid="Base_Column_List"></include>
+ from sec_user
+ WHERE isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ <if test="name != null and name != ''">
+ AND (nick_name LIKE concat('%',#{name},'%')
+ OR phone LIKE concat('%',#{name},'%'))
+ </if>
+ <if test="deptIds != null and deptIds.size()>0">
+ AND deptId IN
+ <foreach collection="deptIds" close=")" open="(" item="id" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ </select>
+ <select id="selectUserById" resultType="com.jilongda.manage.authority.model.SecUser">
+ select <include refid="Base_Column_List"></include>
+ from sec_user
+ where id = #{orderingPersonId}
+ </select>
+ <select id="queryList" resultType="com.jilongda.manage.authority.model.SecUser">
+ select <include refid="Base_Column_List"></include>
+ from sec_user
+ </select>
+
+ <delete id="removeById">
+ delete
+ from sec_user
+ where id = #{uid}
+ </delete>
</mapper>
diff --git a/manage/src/main/resources/mapping/SecUserRoleMapper.xml b/manage/src/main/resources/mapping/SecUserRoleMapper.xml
index b397bb4..603f801 100644
--- a/manage/src/main/resources/mapping/SecUserRoleMapper.xml
+++ b/manage/src/main/resources/mapping/SecUserRoleMapper.xml
@@ -1,16 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jilongda.manage.mapper.SecUserRoleMapper">
-
+<mapper namespace="com.jilongda.manage.authority.mapper.SecUserRoleMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.jilongda.manage.model.SecUserRole">
- <result column="role_id" property="roleId" />
- <result column="user_id" property="userId" />
+ <resultMap id="BaseResultMap" type="com.jilongda.manage.authority.model.SecUserRole">
+ <result column="role_id" property="roleId"/>
+ <result column="user_id" property="userId"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- role_id, user_id
+ role_id
+ , user_id
</sql>
-
+ <select id="getRoleByUserId" resultType="com.jilongda.manage.authority.model.SecRole">
+ select sr.id,
+ sr.rolename,
+ sr.role_desc,
+ sr.createBy,
+ sr.createTime,
+ sr.updateBy,
+ sr.updateTime,
+ sr.isDelete,
+ sr.role_state
+ from sec_user su
+ left join sec_user_role sur on su.id = sur.user_id
+ left join sec_role sr on sur.role_id = sr.id
+ where su.id = #{userId,jdbcType=VARCHAR}
+ AND su.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </select>
</mapper>
diff --git a/manage/src/main/resources/mapping/TStoreMapper.xml b/manage/src/main/resources/mapping/TStoreMapper.xml
index 3072122..92a5c95 100644
--- a/manage/src/main/resources/mapping/TStoreMapper.xml
+++ b/manage/src/main/resources/mapping/TStoreMapper.xml
@@ -5,7 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.jilongda.manage.model.TStore">
<id column="id" property="id" />
- <result column="name" property="name" />
+ <result column="`name`" property="name" />
<result column="province" property="province" />
<result column="provinceCode" property="provinceCode" />
<result column="city" property="city" />
@@ -25,7 +25,21 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, name, province, provinceCode, city, cityCode, area, areaCode, address, createTime, updateTime, createBy, updateBy, isDelete, lon, lat, img
+ id, `name`, province, provinceCode, city, cityCode, area, areaCode, address, createTime, updateTime, createBy, updateBy, isDelete, lon, lat, img
</sql>
+ <select id="pageList" resultType="com.jilongda.manage.vo.TStoreVO">
+ select <include refid="Base_Column_List"></include>
+ from t_store
+ <where>
+ <if test="query.name != null and query.name != ''">
+ and `name` like concat('%',#{name},'%')
+ </if>
+ <if test="query.status != null">
+ and `status` = #{query.status}
+ </if>
+ AND isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY createTime DESC
+ </select>
</mapper>
--
Gitblit v1.7.1