From 98ef8736f9a47299d9ba70ceabc1ed0c4ba249db Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 18:31:28 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java | 16 ++-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 24 ++++-
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2
ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java | 28 ++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysLogQuery.java | 36 +++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 5 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorQuery.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java | 6 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 63 +++++++++++----
10 files changed, 145 insertions(+), 39 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
index 5344b6a..6ff43c4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
@@ -3,10 +3,12 @@
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.query.SysOperLogQuery;
import io.swagger.annotations.Api;
@@ -40,16 +42,16 @@
@Api(tags = "操作日志记录")
public class SysOperlogController extends BaseController
{
- @Autowired
+ @Resource
private ISysOperLogService operLogService;
- @RequiresPermissions("system:operlog:list")
- @GetMapping("/list")
- public TableDataInfo list(SysOperLog operLog)
+
+ @ApiOperation(value = "操作日志查询")
+ @PostMapping("/list")
+ public R<List<SysOperLog>> list(@RequestBody SysOperLogQuery gy)
{
- startPage();
- List<SysOperLog> list = operLogService.selectOperLogList(operLog);
- return getDataTable(list);
+ List<SysOperLog> list = operLogService.list();
+ return R.ok(list);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index e21c333..f1e3850 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -154,7 +154,7 @@
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("Dept", deptService.selectDeptList(null));
if (StringUtils.isNotNull(userId)) {
- SysUser sysUser = userService.selectUserById(userId);
+ SysUser sysUser = userService.getById(userId);
ajax.put(AjaxResult.DATA_TAG, sysUser);
ajax.put("Dept", sysUser.getDept());
ajax.put("roleId", sysUser.getRoleId());
@@ -400,7 +400,7 @@
@PostMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody ResetPwdDTO dto) {
SysUser user = userService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId())
- .in(SysUser::getUserType, "00", "02").one();
+ .in(SysUser::getUserType, "00", "01", "02", "03").one();
if (StringUtils.isNull(user)) {
throw new ServiceException("账号不存在");
}
@@ -572,6 +572,13 @@
return R.ok(userService.getSupplierPage(query));
}
+
+ @ApiOperation(value = "获取供应商不分页列表", notes = "获取供应商不分页列表")
+ @PostMapping("/supplier-page1")
+ public R<List<SysUser>> getSupplierPage1() {
+ return R.ok(userService.getSupplierPage1());
+ }
+
/**
* 添加/编辑供应商
*
@@ -598,10 +605,16 @@
}
- @ApiOperation(value = "获取管理员分页列表", notes = "获取管理员分页列表")
+ @ApiOperation(value = "获取仓库管理员分页列表", notes = "获取仓库管理分页列表")
@PostMapping("/conservator-page")
public R<PageDTO<ConservatorVO>> getConservatorPage(@Validated @RequestBody ConservatorQuery query) {
return R.ok(userService.getConservatorPage(query));
+ }
+
+ @ApiOperation(value = "获取仓库管理员不分页列表", notes = "获取仓库管理分页列表")
+ @PostMapping("/conservator-page1")
+ public R<List<SysUser>> getConservatorPage1() {
+ return R.ok(userService.getConservatorPage1());
}
/**
@@ -609,8 +622,7 @@
*
* @param dto 供应商数据传输对象
*/
- @Log(title = "管理员", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "添加/编辑管理员", notes = "添加/编辑管理员")
+ @ApiOperation(value = "添加/编辑仓库管理", notes = "添加/编辑仓库管理")
@PostMapping("/save-conservator")
public R<?> saveConservator(@Validated @RequestBody ConservatorDTO dto) {
userService.saveConservator(dto);
@@ -622,7 +634,7 @@
*
* @param id 供应商id
*/
- @ApiOperation(value = "删除管理员", notes = "删除管理员")
+ @ApiOperation(value = "删除仓库管理", notes = "删除仓库管理")
@DeleteMapping("/delete-conservator/{id}")
public R<?> deleteConservator(@PathVariable("id") Long id) {
userService.deleteConservator(id);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorQuery.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorQuery.java
index 81f539e..c106eb7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorQuery.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorQuery.java
@@ -17,7 +17,7 @@
@ApiModelProperty("联系电话")
private String phonenumber;
- @ApiModelProperty(value = "1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位", hidden = true)
+ @ApiModelProperty(value = "1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位")
private Integer roleType;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysLogQuery.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysLogQuery.java
new file mode 100644
index 0000000..42a94d6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysLogQuery.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.domain.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("操作日志列表查询数据传输对象")
+public class SysLogQuery extends BasePage {
+
+ /** 日志主键 */
+ private Long operId;
+
+ /** 操作模块 */
+ @ApiModelProperty("操作模块")
+
+ private String title;
+
+ /** 操作人员 */
+ @ApiModelProperty("操作人员")
+ private String operName;
+
+ /** 操作时间 */
+ @ApiModelProperty("开始时间")
+ private Date beginTime;
+
+ /** 操作时间 */
+ @ApiModelProperty("结束时间")
+ private Date endTime;
+
+ @ApiModelProperty("电话")
+ private String phone;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
index f243dcd..eeb8cc7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.mapper;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.domain.SysOperLog;
/**
@@ -8,8 +10,8 @@
*
* @author ruoyi
*/
-public interface SysOperLogMapper
-{
+public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
+
/**
* 新增操作日志
*
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java
index 84d75e4..f7f43ba 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java
@@ -5,12 +5,34 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
@Data
-@ApiModel(value = "当前车辆查询操作日志")
+@ApiModel(value = "当前车辆操作日志")
public class SysOperLogQuery extends BasePage {
- @ApiModelProperty(value = "车辆id")
- private Integer carId;
+ /** 日志主键 */
+ private Long operId;
+
+ /** 操作模块 */
+ @ApiModelProperty("操作模块")
+
+ private String title;
+
+ /** 操作人员 */
+ @ApiModelProperty("操作人员")
+ private String operName;
+
+ /** 操作时间 */
+ @ApiModelProperty("开始时间")
+ private Date beginTime;
+
+ /** 操作时间 */
+ @ApiModelProperty("结束时间")
+ private Date endTime;
+
+ @ApiModelProperty("电话")
+ private String phone;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 673c023..7d37b4b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.dto.ConservatorDTO;
@@ -236,6 +237,8 @@
*/
PageDTO<SupplierVO> getSupplierPage(SupplierQuery query);
+ List<SysUser> getSupplierPage1();
+
/**
* 添加/编辑供应商
*
@@ -252,6 +255,8 @@
PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query);
+ List<SysUser> getConservatorPage1();
+
void saveConservator(ConservatorDTO dto);
void deleteConservator( Long id);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index a2dda56..71d303e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,14 +1,18 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanValidators;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -597,6 +601,17 @@
return PageDTO.of(page,SupplierVO.class);
}
+ @Override
+ public List<SysUser> getSupplierPage1() {
+ LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SysUser::getUserType, "02");
+
+
+ wrapper1.eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime);
+ List<SysUser> page1 = this.list(wrapper1);
+ return page1;
+ }
+
/**
* 添加/编辑供应商
*
@@ -648,38 +663,51 @@
@Override
public PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query) {
- Page<SysUser> page = this.lambdaQuery()
- .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
- .like(StringUtils.isNotBlank(query.getNickName()
- ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "03")
- .eq(StringUtils.isNotBlank(query.getPhonenumber()
- ),SysUser::getPhonenumber,query.getPhonenumber())
- .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
- .page(new Page<>(query.getPageCurr(), query.getPageSize()));
- if (StringUtils.isEmpty(page.getRecords())) {
- return PageDTO.empty(page);
+ Page<SysUser> objectPage = new Page<>(query.getPageCurr(), query.getPageSize());
+
+ LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(StringUtils.isNotBlank(query.getNickName()
+ ),SysUser::getNickName,query.getNickName());
+ wrapper1.eq(SysUser::getUserType, "03");
+ if (query.getRoleType()!=0){
+ wrapper1.eq(SysUser::getRoleType, query.getRoleType());
}
- return PageDTO.of(page, ConservatorVO.class);
+
+ wrapper1.like(StringUtils.isNotBlank(query.getPhonenumber()
+ ),SysUser::getPhonenumber,query.getPhonenumber()) .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime);
+ Page<SysUser> page1 = this.page(objectPage, wrapper1);
+
+ return PageDTO.of(page1, ConservatorVO.class);
+ }
+
+ @Override
+ public List<SysUser> getConservatorPage1() {
+ List<SysUser> page1 = this.list();
+
+ return page1;
}
@Override
public void saveConservator(ConservatorDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
- boolean b = checkPhoneUnique(user);
- if (!b) {
- throw new ServiceException("该手机号已存在");
- }
+
// 添加
if (StringUtils.isNull(dto.getUserId())) {
+
+ boolean b = checkPhoneUnique(user);
+ if (!b) {
+ throw new ServiceException("该手机号已存在");
+ }
+
user.setNickName(dto.getNickName());
user.setUserName(dto.getPhonenumber());
user.setUserType("03");
user.setCreateTime(new Date());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword("123456"));
user.setCreateBy(SecurityUtils.getUsername());
user.setProvinceName(dto.getProvinceName());
user.setProvinceCode(dto.getProvinceCode());
- user.setCityName(dto.getCityCode());
+ user.setCityName(dto.getCityName());
user.setCityCode(dto.getCityCode());
user.setCountyName(dto.getCountyName());
user.setCountyCode(dto.getCountyCode());
@@ -697,7 +725,6 @@
user.setPhonenumber(dto.getPhonenumber());
user.setUserName(dto.getPhonenumber());
user.setUpdateTime(new Date());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
user.setUpdateBy(SecurityUtils.getUsername());
user.setRoleType(dto.getRoleType());
this.updateById(user);
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 9844837..6fd7c73 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -171,7 +171,7 @@
<if test="status !=null and status !=''">
and su.status = #{status}
</if>
- and su.del_flag = '0' and su.user_type in('00')
+ and su.del_flag = '0' and su.user_type in('00','01')
order by su.create_time desc
</select>
<select id="getAllList" resultType="com.ruoyi.system.api.domain.SysUser">
diff --git a/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
index 9844837..6fd7c73 100644
--- a/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml
@@ -171,7 +171,7 @@
<if test="status !=null and status !=''">
and su.status = #{status}
</if>
- and su.del_flag = '0' and su.user_type in('00')
+ and su.del_flag = '0' and su.user_type in('00','01')
order by su.create_time desc
</select>
<select id="getAllList" resultType="com.ruoyi.system.api.domain.SysUser">
--
Gitblit v1.7.1