root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 班组对应人员、人员对应设备

Browse Source
This commit is contained in:
liuxy
2023-06-20 11:04:46 +08:00
parent 1f52add7c4
commit 7464ba067c
27 changed files with 1037 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java
View File

@@ -2,7 +2,9 @@
package org.nl.wms.device_manage.controller.userdevice;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.jsonwebtoken.lang.Assert;
@@ -14,14 +16,14 @@ import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
import org.nl.wms.mps.service.PersoncorrdeviceService;
import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -45,7 +47,7 @@ public class PersoncorrdeviceController {
@GetMapping
@Log("查询人员设备维护")
@ApiOperation("查询人员设备维护")
public ResponseEntity<Object> query(@RequestParam Map query, PageQuery page){
public ResponseEntity<Object> query(DeviceUserQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> list = pdmBiPersoncorrdeviceService.queryAll(query);
TableDataInfo build = TableDataInfo.build(list);
@@ -53,24 +55,64 @@ public class PersoncorrdeviceController {
return new ResponseEntity<>(build,HttpStatus.OK);
}
@GetMapping("/device")
@Log("查询设备")
@ApiOperation("查询设备")
public ResponseEntity<Object> device(DeviceUserQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> list = pdmBiPersoncorrdeviceService.queryAllDevice(query);
TableDataInfo build = TableDataInfo.build(list);
build.setTotalElements(result.getTotal());
return new ResponseEntity<>(build,HttpStatus.OK);
}
@PostMapping
@Log("新增人员设备维护")
@ApiOperation("新增人员设备维护")
//@PreAuthorize("@el.check('personcorrdevice:add')")
public ResponseEntity<Object> create(@RequestBody JSONObject entity){
Assert.notNull(entity,"请求参数不能为空");
PdmBiPersoncorrdevice one = pdmBiPersoncorrdeviceService.getOne(
new QueryWrapper<PdmBiPersoncorrdevice>().lambda()
.eq(PdmBiPersoncorrdevice::getUser_id, entity.getString("user_id"))
.eq(PdmBiPersoncorrdevice::getDevice_code, entity.getString("device_code"))
);
if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
PdmBiPersoncorrdevice pdmBiPersoncorrdevice = entity.toJavaObject(PdmBiPersoncorrdevice.class);
pdmBiPersoncorrdevice.setId(IdUtil.getStringId());
pdmBiPersoncorrdevice.setPerson_id(IdUtil.getStringId());
pdmBiPersoncorrdeviceService.save(pdmBiPersoncorrdevice);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改人员设备维护")
@ApiOperation("修改人员设备维护")
//@PreAuthorize("@el.check('personcorrdevice:add')")
public ResponseEntity<Object> update(@RequestBody JSONObject entity){
PdmBiPersoncorrdevice one = pdmBiPersoncorrdeviceService.getOne(
new QueryWrapper<PdmBiPersoncorrdevice>().lambda()
.eq(PdmBiPersoncorrdevice::getUser_id, entity.getString("user_id"))
.eq(PdmBiPersoncorrdevice::getDevice_code, entity.getString("device_code"))
);
if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
PdmBiPersoncorrdevice pdmBiPersoncorrdevice = pdmBiPersoncorrdeviceService.getById(entity.getString("person_id"));
pdmBiPersoncorrdevice.setDevice_code(entity.getString("device_code"));
pdmBiPersoncorrdeviceService.updateById(pdmBiPersoncorrdevice);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@Log("删除人员设备维护")
@ApiOperation("删除人员设备维护")
//@PreAuthorize("@el.check('personcorrdevice:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids != null && ids.length>0){
pdmBiPersoncorrdeviceService.removeByIds(Arrays.asList(ids));
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
View File

@@ -2,9 +2,9 @@ package org.nl.wms.device_manage.service.userdevice;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
import org.springframework.data.domain.Pageable;
@@ -27,7 +27,7 @@ public interface IPdmBiPersoncorrdeviceService extends IService<PdmBiPersoncorrd
* @param whereJson 条件
* @return Map<String,Object>
*/
List<Map> queryAll(Map whereJson);
List<Map> queryAll(DeviceUserQuery whereJson);
/**
@@ -80,4 +80,6 @@ public interface IPdmBiPersoncorrdeviceService extends IService<PdmBiPersoncorrd
void addDevices(JSONObject param);
void deleteRow(JSONObject param);
List<Map> queryAllDevice(DeviceUserQuery whereJson);
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
View File

@@ -16,13 +16,13 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pdm_bi_personcorrdevice")
@TableName("mps_personcorrdevice")
public class PdmBiPersoncorrdevice implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id")
private String id;
@TableId
private String person_id;
/**
* 用户id
*/

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
View File

@@ -1,7 +1,9 @@
package org.nl.wms.device_manage.service.userdevice.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
import java.util.List;
import java.util.Map;
@@ -16,5 +18,7 @@ import java.util.Map;
*/
public interface PdmBiPersoncorrdeviceMapper extends BaseMapper<PdmBiPersoncorrdevice> {
List<Map> queryAll(Map query);
List<Map> queryAll(@Param("query") DeviceUserQuery query);
List<Map> queryAllDevice(@Param("query") DeviceUserQuery query);
}

26
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
View File

@@ -3,6 +3,32 @@
<mapper namespace="org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper">
<select id="queryAll" resultType="java.util.Map">
SELECT
*
FROM
sys_user
<where>
is_used = '1'
<if test="query.username != null and query.username != ''">
and username = #{query.username}
</if>
</where>
</select>
<select id="queryAllDevice" resultType="java.util.Map">
SELECT
device.device_code,
device.device_name,
use1.person_name,
mps.person_id
FROM
mps_personcorrdevice mps
LEFT JOIN pdm_bi_device device ON device.device_code = mps.device_code
LEFT JOIN sys_user use1 ON use1.user_id = mps.user_id
<where>
mps.user_id = #{query.user_id}
</where>
</select>
</mapper>

27
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dto/DeviceUserQuery.java Normal file
View File

@@ -0,0 +1,27 @@
package org.nl.wms.device_manage.service.userdevice.dto;
import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.common.domain.query.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
import org.nl.wms.system_manage.service.user.dto.UserDto;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class DeviceUserQuery extends BaseQuery<UserDto> {
private String username;
private String user_id;
@Override
public void paramMapping() {
super.doP.put("username", QParam.builder().k(new String[]{"username"}).type(QueryTEnum.LK).build());
}
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
View File

@@ -2,11 +2,11 @@ package org.nl.wms.device_manage.service.userdevice.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper;
import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -26,9 +26,8 @@ import java.util.Map;
public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl<PdmBiPersoncorrdeviceMapper, PdmBiPersoncorrdevice> implements IPdmBiPersoncorrdeviceService {
@Override
public List<Map> queryAll(Map query) {
this.baseMapper.queryAll(query);
return null;
public List<Map> queryAll(DeviceUserQuery query) {
return this.baseMapper.queryAll(query);
}
@Override
@@ -85,4 +84,9 @@ public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl<PdmBiPersoncor
public void deleteRow(JSONObject param) {
}
@Override
public List<Map> queryAllDevice(DeviceUserQuery query) {
return this.baseMapper.queryAllDevice(query);
}
}

120
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java Normal file
View File

@@ -0,0 +1,120 @@
package org.nl.wms.product_manage.controller.teamcorrPerson;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.jsonwebtoken.lang.Assert;
import io.swagger.annotations.ApiOperation;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
import org.nl.wms.product_manage.service.teamcorrPerson.IPdmBiTeamcorrpersonService;
import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson;
import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* <p>
* 班组与人员对应关系表 前端控制器
* </p>
*
* @author generator
* @since 2023-06-20
*/
@RestController
@RequestMapping("/api/pdmBiTeamcorrperson")
public class PdmBiTeamcorrpersonController {
@Autowired
private IPdmBiTeamcorrpersonService iPdmBiTeamcorrpersonService;
@GetMapping
@Log("查询人员设备维护")
@ApiOperation("查询人员设备维护")
public ResponseEntity<Object> query(WorkTeamQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> list = iPdmBiTeamcorrpersonService.queryAll(query);
TableDataInfo build = TableDataInfo.build(list);
build.setTotalElements(result.getTotal());
return new ResponseEntity<>(build, HttpStatus.OK);
}
@GetMapping("/queryUser")
@Log("查询人员设备维护")
@ApiOperation("查询人员设备维护")
public ResponseEntity<Object> queryUser(WorkTeamQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> list = iPdmBiTeamcorrpersonService.queryUser(query);
TableDataInfo build = TableDataInfo.build(list);
build.setTotalElements(result.getTotal());
return new ResponseEntity<>(build, HttpStatus.OK);
}
@PostMapping
@Log("新增班组对应人员")
@ApiOperation("新增班组对应人员")
public ResponseEntity<Object> create(@RequestBody JSONObject entity){
Assert.notNull(entity,"请求参数不能为空");
PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne(
new QueryWrapper<PdmBiTeamcorrperson>().lambda()
.eq(PdmBiTeamcorrperson::getUser_id, entity.getString("user_id"))
.eq(PdmBiTeamcorrperson::getTeam_id, entity.getString("team_id"))
);
if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("人员重复");
PdmBiTeamcorrperson pdmBiTeamcorrperson = entity.toJavaObject(PdmBiTeamcorrperson.class);
pdmBiTeamcorrperson.setTeam_person_id(IdUtil.getStringId());
iPdmBiTeamcorrpersonService.save(pdmBiTeamcorrperson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改班组对应人员")
@ApiOperation("修改班组对应人员")
public ResponseEntity<Object> update(@RequestBody JSONObject entity){
PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne(
new QueryWrapper<PdmBiTeamcorrperson>().lambda()
.eq(PdmBiTeamcorrperson::getUser_id, entity.getString("user_id"))
.eq(PdmBiTeamcorrperson::getTeam_id, entity.getString("team_id"))
);
if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("人员重复");
PdmBiTeamcorrperson pdmBiTeamcorrperson = iPdmBiTeamcorrpersonService.getById(entity.getString("team_person_id"));
pdmBiTeamcorrperson.setUser_id(entity.getString("user_id"));
iPdmBiTeamcorrpersonService.updateById(pdmBiTeamcorrperson);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@Log("删除班组对应人员")
@ApiOperation("删除班组对应人员")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids != null && ids.length>0){
iPdmBiTeamcorrpersonService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
}

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls
View File

Binary file not shown.

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/IPdmBiTeamcorrpersonService.java Normal file
View File

@@ -0,0 +1,23 @@
package org.nl.wms.product_manage.service.teamcorrPerson;
import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 班组与人员对应关系表 服务类
* </p>
*
* @author generator
* @since 2023-06-20
*/
public interface IPdmBiTeamcorrpersonService extends IService<PdmBiTeamcorrperson> {
List<Map> queryAll(WorkTeamQuery query);
List<Map> queryUser(WorkTeamQuery query);
}

41
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/PdmBiTeamcorrperson.java Normal file
View File

@@ -0,0 +1,41 @@
package org.nl.wms.product_manage.service.teamcorrPerson.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 班组与人员对应关系表
* </p>
*
* @author generator
* @since 2023-06-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("pdm_bi_teamcorrperson")
public class PdmBiTeamcorrperson implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 班组人员对应标识
*/
@TableId
private String team_person_id;
/**
* 班组标识
*/
private String team_id;
/**
* 操作工标识
*/
private String user_id;
}

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/PdmBiTeamcorrpersonMapper.java Normal file
View File

@@ -0,0 +1,24 @@
package org.nl.wms.product_manage.service.teamcorrPerson.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 班组与人员对应关系表 Mapper 接口
* </p>
*
* @author generator
* @since 2023-06-20
*/
public interface PdmBiTeamcorrpersonMapper extends BaseMapper<PdmBiTeamcorrperson> {
List<Map> queryAll(@Param("query") WorkTeamQuery query);
List<Map> queryUser(@Param("query") WorkTeamQuery query);
}

34
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/xml/PdmBiTeamcorrpersonMapper.xml Normal file
View File

@@ -0,0 +1,34 @@
<?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="org.nl.wms.product_manage.service.teamcorrPerson.dao.mapper.PdmBiTeamcorrpersonMapper">
<select id="queryAll" resultType="java.util.Map">
SELECT
*
FROM
PDM_BI_WorkTeam
<where>
is_delete = '0'
<if test="query.team_code != null and query.team_code != ''">
and (team_code like #{query.team_code} or
team_name like #{query.team_code})
</if>
</where>
</select>
<select id="queryUser" resultType="java.util.Map">
SELECT
u.*,
person.team_person_id
FROM
pdm_bi_teamcorrperson person
LEFT JOIN sys_user u ON u.user_id = person.user_id
<where>
person.team_id = #{query.team_id}
</where>
</select>
</mapper>

27
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dto/WorkTeamQuery.java Normal file
View File

@@ -0,0 +1,27 @@
package org.nl.wms.product_manage.service.teamcorrPerson.dto;
import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.common.domain.query.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.modules.common.base.BaseDTO;
import org.nl.wms.system_manage.service.user.dto.UserDto;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class WorkTeamQuery extends BaseQuery<BaseDTO> {
private String team_code;
private String team_id;
@Override
public void paramMapping() {
super.doP.put("team_code", QParam.builder().k(new String[]{"team_code"}).type(QueryTEnum.LK).build());
}
}

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/impl/PdmBiTeamcorrpersonServiceImpl.java Normal file
View File

@@ -0,0 +1,33 @@
package org.nl.wms.product_manage.service.teamcorrPerson.impl;
import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson;
import org.nl.wms.product_manage.service.teamcorrPerson.dao.mapper.PdmBiTeamcorrpersonMapper;
import org.nl.wms.product_manage.service.teamcorrPerson.IPdmBiTeamcorrpersonService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
* 班组与人员对应关系表 服务实现类
* </p>
*
* @author generator
* @since 2023-06-20
*/
@Service
public class PdmBiTeamcorrpersonServiceImpl extends ServiceImpl<PdmBiTeamcorrpersonMapper, PdmBiTeamcorrperson> implements IPdmBiTeamcorrpersonService {
@Override
public List<Map> queryAll(WorkTeamQuery query) {
return this.baseMapper.queryAll(query);
}
@Override
public List<Map> queryUser(WorkTeamQuery query) {
return this.baseMapper.queryUser(query);
}
}