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

rev: 在线用户、强制用户下线、对接日志

Browse Source
This commit is contained in:
liyongde
2023-08-03 14:50:13 +08:00
parent 373670a51d
commit 13c1cdb824
35 changed files with 315 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/doc/wms.xls
View File

Binary file not shown.

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
View File

@@ -49,11 +49,11 @@ public class AuthorizationController {
@ApiOperation("登录授权")
@PostMapping(value = "/login")
public ResponseEntity<Object> login(@RequestBody Map authMap) throws Exception {
public ResponseEntity<Object> login(@RequestBody Map authMap, HttpServletRequest request) throws Exception {
if (ObjectUtil.isEmpty(authMap)){
return ResponseEntity.noContent().build();
}
return ResponseEntity.ok(onlineUserService.login(authMap));
return ResponseEntity.ok(onlineUserService.login(authMap, request));
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java
View File

@@ -15,10 +15,12 @@
*/
package org.nl.system.controller.user;
import com.alibaba.fastjson.JSONArray;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nl.common.utils.EncryptUtils;
import org.nl.system.service.secutiry.impl.OnlineUserService;
import org.nl.system.service.user.dto.OnlineUserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
/**
@@ -57,10 +60,10 @@ public class OnlineController {
@ApiOperation("踢出用户")
@DeleteMapping
// @SaCheckPermission("@el.check()")
public ResponseEntity<Object> delete(@RequestBody Set<String> keys) throws Exception {
for (String key : keys) {
public ResponseEntity<Object> delete(@RequestBody List<OnlineUserDto> keys) throws Exception {
for (OnlineUserDto key : keys) {
// 解密Key
key = EncryptUtils.desDecrypt(key);
key.setKey(EncryptUtils.desDecrypt(key.getKey()));
onlineUserService.kickOut(key);
}
return new ResponseEntity<>(HttpStatus.OK);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java
View File

@@ -65,4 +65,6 @@ public interface ISysDeptService extends IService<SysDept> {
void createDept(SysDept dept);
List<SysDept> getUserDeptByUserId(String userId);
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java
View File

@@ -41,4 +41,6 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
* @return
*/
String findAllChild(String pid);
List<SysDept> getUserDeptByUserId(String userId);
}

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml
View File

@@ -37,4 +37,17 @@
</foreach>
)
</select>
<select id="getUserDeptByUserId" resultType="org.nl.system.service.dept.dao.SysDept">
SELECT
sd.*
FROM
sys_dept sd
WHERE sd.dept_id IN (
SELECT
d.dept_id
FROM
`sys_user_dept` d
WHERE d.user_id = #{userId}
) AND sd.is_used = TRUE
</select>
</mapper>

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java
View File

@@ -176,4 +176,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
sysDeptMapper.updateSubCount(dept.getPid());
}
}
@Override
public List<SysDept> getUserDeptByUserId(String userId) {
return sysDeptMapper.getUserDeptByUserId(userId);
}
}

53
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
View File

@@ -18,9 +18,11 @@ package org.nl.system.service.secutiry.impl;
import cn.dev33.satoken.secure.SaSecureUtil;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -28,6 +30,8 @@ import org.nl.common.utils.*;
import org.nl.config.RsaProperties;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.dto.CurrentUser;
import org.nl.system.service.dept.ISysDeptService;
import org.nl.system.service.dept.dao.SysDept;
import org.nl.system.service.secutiry.dto.UserDto;
import org.nl.system.service.role.ISysRoleService;
import org.nl.system.service.secutiry.dto.AuthUserDto;
@@ -55,6 +59,8 @@ public class OnlineUserService {
@Autowired
private ISysUserService sysUserService;
@Autowired
private ISysDeptService deptService;
@Autowired
private ISysRoleService roleService;
@Autowired
private RedisUtils redisUtils;
@@ -69,20 +75,27 @@ public class OnlineUserService {
* @param token /
* @param request /
*/
public void save(UserDto userDto, String token, HttpServletRequest request){
// String dept = userDto.getDept().getName();
String dept = "";
public void save(SysUser userDto, String token, HttpServletRequest request){
// 获取用户部门
List<SysDept> userDeptByUserId = deptService.getUserDeptByUserId(userDto.getUser_id());
StringBuilder sb = new StringBuilder();
for (SysDept dept : userDeptByUserId) {
sb.append(dept.getName()).append("、");
}
if (sb.length() > 0) {
sb.setLength(sb.length() - 1);
}
String dept = sb.toString();
String ip = StringUtils.getIp(request);
String browser = StringUtils.getBrowser(request);
// String address = StringUtils.getCityInfo(ip);
String address = "局域网";
String address = StringUtils.getCityInfo(ip);
OnlineUserDto onlineUserDto = null;
try {
// onlineUserDto = new OnlineUserDto(userDto.getUsername(), userDto.getNickName(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date());
onlineUserDto = new OnlineUserDto(userDto.getUsername(), userDto.getPerson_name(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date());
} catch (Exception e) {
log.error(e.getMessage(),e);
}
redisUtils.set(token, onlineUserDto, StpUtil.getTokenTimeout());
redisUtils.set("oline-" + userDto.getUsername(), onlineUserDto, StpUtil.getTokenTimeout());
}
/**
@@ -109,7 +122,7 @@ public class OnlineUserService {
Collections.reverse(keys);
List<OnlineUserDto> onlineUserDtos = new ArrayList<>();
for (String key : keys) {
if (key.length() == 1511) {
if (key.startsWith("oline-")) {
OnlineUserDto onlineUserDto = (OnlineUserDto) redisUtils.get(key);
if(StrUtil.isNotEmpty(filter)){
if(onlineUserDto.toString().contains(filter)){
@@ -127,10 +140,26 @@ public class OnlineUserService {
/**
* 踢出用户
* @param key /
* @param key: OnlineUserDto /
*/
public void kickOut(String key){
public void kickOut(OnlineUserDto key) {
// 获取用户
SysUser one = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, key.getUserName()));
if (ObjectUtil.isNotEmpty(one)) {
redisUtils.del("oline-" + one.getUsername());
}
// 下线
StpUtil.logoutByTokenValue(key.getKey()); // 通过token强退
}
/**
* 踢出用户
* @param key：token /
*/
public void kickOut(String key) {
redisUtils.del(key);
// 下线
StpUtil.logoutByTokenValue(key); // 通过token强退
}
/**
@@ -211,7 +240,7 @@ public class OnlineUserService {
}
}
@SneakyThrows
public Map<String, Object> login(Map paramMap){
public Map<String, Object> login(Map paramMap, HttpServletRequest request){
// 密码解密 - 前端的加密规则: encrypt
AuthUserDto authUser = JSON.toJavaObject((JSON) JSON.toJSON(paramMap), AuthUserDto.class);
String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword());
@@ -263,7 +292,7 @@ public class OnlineUserService {
put("user", user);
}};
// 保存在线信息
// onlineUserService.save(userDto, StpUtil.getTokenValue(), request);
this.save(userInfo, StpUtil.getTokenValue(), request);
return authInfo;
}
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
View File

@@ -1,6 +1,5 @@
package org.nl.system.service.user;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.system.service.user.dao.SysUser;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord;
import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
import java.util.Map;
import java.util.Set;
@@ -27,7 +28,7 @@ public interface IDasDeviceCheckRecordService extends IService<DasDeviceCheckRec
* 创建
* @param entity /
*/
void create(DasDeviceCheckRecord entity);
PdaResponseVo create(DasDeviceCheckRecord entity);
/**
* 编辑

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java
View File

@@ -17,6 +17,7 @@ import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.das.devicecheck.service.IDasDeviceCheckRecordService;
import org.nl.wms.das.devicecheck.service.dao.mapper.DasDeviceCheckRecordMapper;
import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord;
import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,7 +47,7 @@ public class DasDeviceCheckRecordServiceImpl extends ServiceImpl<DasDeviceCheckR
}
@Override
public void create(DasDeviceCheckRecord entity) {
public PdaResponseVo create(DasDeviceCheckRecord entity) {
SysUser sysUser = userService.getOne(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getUsername, entity.getUsername()));
String now = DateUtil.now();
@@ -54,6 +55,7 @@ public class DasDeviceCheckRecordServiceImpl extends ServiceImpl<DasDeviceCheckR
entity.setRecord_time(now);
entity.setPerson_name(sysUser.getPerson_name());
dasDeviceCheckRecordMapper.insert(entity);
return PdaResponseVo.pdaResultOk("设备[" + entity.getDevice_code() + "]点检成功,点检人: " + sysUser.getPerson_name());
}
@Override

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
View File

@@ -5,12 +5,9 @@ import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
/**
* @Author: lyd
* @Description:
* @Description: acs请求wms
* @Date: 2023/6/26
*/
public interface AcsToWmsService {
BaseResponse acsApply(JSONObject param);
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/MesToWmsService.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.wms.ext.acs.service;
/**
* @Author: lyd
* @Description: mes请求wms
* @Date: 2023/8/3
*/
public interface MesToWmsService {
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToMesService.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.wms.ext.acs.service;
/**
* @Author: lyd
* @Description: wms请求acs
* @Date: 2023/8/3
*/
public interface WmsToMesService {
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -129,7 +129,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
NoticeTypeEnum.EXCEPTION.getCode());
}
// acs对接记录
interactRecordService.saveRecord(param, result, GeneralDefinition.ACS_LMS);
interactRecordService.saveRecord(param.getString("request_medthod_name"), param, result, GeneralDefinition.ACS_LMS);
return result;
}

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/MesToWmsServiceImpl.java Normal file
View File

@@ -0,0 +1,15 @@
package org.nl.wms.ext.acs.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.ext.acs.service.MesToWmsService;
import org.springframework.stereotype.Service;
/**
* @Author: lyd
* @Description:
* @Date: 2023/8/3
*/
@Slf4j
@Service
public class MesToWmsServiceImpl implements MesToWmsService {
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
View File

@@ -7,14 +7,12 @@ import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.ext.acs.service.dto.ResultForAcs;
import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest;
import org.nl.wms.ext.record.service.ISysInteractRecordService;
import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.task.AcsUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -43,7 +41,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
resultForAcs.setMessage(e.getMessage());
}
// 记录日志
interactRecordService.saveRecord(workorder, resultForAcs, GeneralDefinition.LMS_ACS);
interactRecordService.saveRecord("下发工单", workorder, resultForAcs, GeneralDefinition.LMS_ACS);
return resultForAcs;
}
@@ -60,7 +58,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
resultForAcs.setMessage(e.getMessage());
}
// 记录日志
// interactRecordService.saveRecord(workorder, resultForAcs, GeneralDefinition.LMS_ACS);
interactRecordService.saveRecord("下发信号传送空木托盘", list, resultForAcs, GeneralDefinition.LMS_ACS);
return resultForAcs;
}
}

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToMesServiceImpl.java Normal file
View File

@@ -0,0 +1,15 @@
package org.nl.wms.ext.acs.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.ext.acs.service.WmsToMesService;
import org.springframework.stereotype.Service;
/**
* @Author: lyd
* @Description:
* @Date: 2023/8/3
*/
@Slf4j
@Service
public class WmsToMesServiceImpl implements WmsToMesService {
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
View File

@@ -61,10 +61,10 @@ public interface ISysInteractRecordService extends IService<SysInteractRecord> {
/**
*
* @param code
* @param name
* @param request
* @param response
* @param direction
*/
<T> void saveRecord(String code, Object request, T response, String direction);
<K, V> void saveRecord(String name, K request, V response, String direction);
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java
View File

@@ -25,8 +25,8 @@ public class SysInteractRecord implements Serializable {
@ApiModelProperty(value = "对接标识")
private String interact_id;
@ApiModelProperty(value = "对接编码")
private String interact_code;
@ApiModelProperty(value = "对接名称")
private String interact_name;
@ApiModelProperty(value = "响应编码")
private int code;

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
View File

@@ -16,7 +16,6 @@ import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
import org.nl.wms.ext.record.service.ISysInteractRecordService;
import org.nl.wms.ext.record.service.dao.mapper.SysInteractRecordMapper;
import org.nl.wms.ext.record.service.dao.SysInteractRecord;
import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,7 +69,7 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
public void saveRecord(Object param, BaseResponse response, String direction) {
SysInteractRecord entity = new SysInteractRecord();
entity.setInteract_id(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setInteract_code(response.getRequestNo());
entity.setInteract_name(response.getRequestNo());
entity.setCode(response.getCode());
entity.setMessage(response.getMessage());
entity.setRecord_time(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
@@ -85,7 +84,7 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
public void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String lmsAcs) {
SysInteractRecord entity = new SysInteractRecord();
entity.setInteract_id(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setInteract_code(workorder.getWorkorder_code());
entity.setInteract_name(workorder.getWorkorder_code());
entity.setCode(resultForAcs.getStatus());
entity.setMessage(resultForAcs.getMessage());
entity.setRecord_time(DateUtil.now());
@@ -97,23 +96,22 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
}
@Override
public <T> void saveRecord(String code, Object request, T response, String direction) {
public <K, V> void saveRecord(String name, K request, V response, String direction) {
SysInteractRecord entity = new SysInteractRecord();
entity.setInteract_id(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setRecord_time(DateUtil.now());
entity.setRecord_time(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
entity.setInteract_name(name);
entity.setDirection(direction);
entity.setRequest_param(JSONObject.toJSONString(request));
entity.setResponse_param(JSONObject.toJSONString(response));
if (response instanceof BaseResponse) {
BaseResponse re = (BaseResponse) response;
entity.setInteract_code(re.getRequestNo());
entity.setCode(re.getCode());
entity.setMessage(re.getMessage());
entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
}
if (response instanceof ResultForAcs) {
ResultForAcs re = (ResultForAcs) response;
entity.setInteract_code(IdUtil.simpleUUID()); // todo: 暂定
entity.setCode(re.getStatus());
entity.setMessage(re.getMessage());
entity.setIs_success(re.getStatus() == HttpStatus.HTTP_OK);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
View File

@@ -37,8 +37,7 @@ public class PdaController {
@ApiOperation("设备点检")
@SaIgnore
public ResponseEntity<Object> deviceCheck(@Validated @RequestBody DasDeviceCheckRecord entity){
deviceCheckRecordService.create(entity);
return new ResponseEntity<>(HttpStatus.OK);
return new ResponseEntity<>(deviceCheckRecordService.create(entity), HttpStatus.OK);
}
@PostMapping("/deviceCheck/deviceInfo")

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
View File

@@ -5,7 +5,7 @@
<select id="getDeviceInfo" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT
p.point_code AS `value`,
p.point_name AS label
p.point_name AS text
FROM
`sch_base_point` p
WHERE p.region_code = 'YZ' AND p.point_type = '1' AND p.point_code = p.parent_point_code
@@ -13,7 +13,7 @@
<select id="getDictByCode" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
SELECT
`value`,
label
label AS text
FROM
`sys_dict`
WHERE `code` = #{code}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/DropdownListVo.java
View File

@@ -12,5 +12,5 @@ import java.io.Serializable;
@Data
public class DropdownListVo implements Serializable {
private String value;
private String label;
private String text;
}

20
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PdaResponseVo.java Normal file
View File

@@ -0,0 +1,20 @@
package org.nl.wms.pda.service.dao.vo;
import lombok.Data;
/**
* @Author: lyd
* @Description: 手持返回
* @Date: 2023/8/3
*/
@Data
public class PdaResponseVo {
// 先提供一个message
private String message;
public static PdaResponseVo pdaResultOk(String message) {
PdaResponseVo vo = new PdaResponseVo();
vo.setMessage(message);
return vo;
}
}

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -40,9 +40,15 @@
0 AS b,
0 AS h,
0 AS w,
0 AS `size`,
0 AS size_error,
0 AS single_weight,
0 AS drawing_address
0 AS drawing_address,
0 AS standard_size1,
0 AS standard_size2,
0 AS standard_size3,
0 AS standard_size4,
0 AS standard_weight,
0 AS detection_error
FROM
`pdm_bd_workorder` w
LEFT JOIN md_base_material m ON m.material_id = w.material_id

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java
View File

@@ -17,7 +17,13 @@ public class AcsWorkOrderVo {
private String b;
private String h;
private String w;
private String size; // 尺寸允许误差
private String size_error; // 尺寸允许误差
private String single_weight; // 单重允许误差
private String drawing_address; // 图纸地址
private String standard_size_height1; // 标准尺寸1
private String standard_size_height2; // 标准尺寸2
private String standard_size_height3; // 标准尺寸3
private String standard_size_height4; // 标准尺寸4
private String standard_weight; // 标准重量
private String detection_error; // 检测误差值
}

21
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -4,10 +4,13 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.ext.acs.service.dto.ResultForAcs;
import org.nl.wms.ext.record.service.ISysInteractRecordService;
import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
import org.nl.wms.sch.point.service.ISchBasePointService;
@@ -33,6 +36,7 @@ import java.util.List;
* @date 2023年05月16日 16:42
* @desc desc
*/
@Slf4j
@Component
public abstract class AbstractTask {
@Autowired
@@ -43,7 +47,8 @@ public abstract class AbstractTask {
private ISchBasePointService pointService;
@Autowired
private IPdmBdWorkorderService workorderService;
@Autowired
private ISysInteractRecordService interactRecordService;
/**
* 任务创建
@@ -72,6 +77,7 @@ public abstract class AbstractTask {
* @created 2020年6月12日 下午5:52:28
*/
protected ResultForAcs renotifyAcs(List<SchBaseTask> taskList) {
ResultForAcs resultForAcs = ResultForAcs.requestOk();
//1、获取任务
//2、根据任务配置补全任务
//3、下发
@@ -97,8 +103,17 @@ public abstract class AbstractTask {
this.setTask(task.getConfig_code(), taskDto);
list.add(taskDto);
}
return AcsUtil.notifyAcs("api/wms/task", list);
try {
resultForAcs = AcsUtil.notifyAcs("api/wms/task", list);
} catch (Exception e) {
log.error("任务下发异常: {}", e.getMessage());
resultForAcs.setTimestamp(DateUtil.now());
resultForAcs.setStatus(HttpStatus.HTTP_BAD_REQUEST);
resultForAcs.setMessage(e.getMessage());
}
// 记录日志
interactRecordService.saveRecord("下发任务", list, resultForAcs, GeneralDefinition.LMS_ACS);
return resultForAcs;
}
private AcsTaskDto setTask(String config_code, AcsTaskDto taskDto) {

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
View File

@@ -13,6 +13,7 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
View File

@@ -20,6 +20,7 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;

4
lms/nladmin-ui/src/views/monitor/online/index.vue
View File

@@ -45,7 +45,7 @@
<p>确定强制退出该用户吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="$refs[scope.$index].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.key, scope.$index)">确定</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" size="mini" type="text">强退</el-button>
</el-popover>
@@ -101,7 +101,7 @@ export default {
const ids = []
if (key instanceof Array) {
key.forEach(val => {
ids.push(val.key)
ids.push(val)
})
} else ids.push(key)
this.delLoading = true

1
lms/nladmin-ui/src/views/system/dept/index.vue
View File

@@ -90,6 +90,7 @@
<el-table
ref="table"
v-loading="crud.loading"
:default-sort = "{prop: 'dept_sort', order: 'ascending'}"
lazy
:load="getDeptDatas"
:tree-props="{children: 'children', hasChildren: 'has_children'}"

73
lms/nladmin-ui/src/views/wms/das/outKiln/index.vue Normal file
View File

@@ -0,0 +1,73 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'入窑时间')" />
<el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'入窑时间')" />
<el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'数量')" />
<el-table-column prop="material_code" label="产品编码" :min-width="flexWidth('material_code',crud.data,'拆垛工位')" />
<el-table-column prop="material_name" label="产品名称" :min-width="flexWidth('material_name',crud.data,'分拣工单')" />
<el-table-column prop="material_qty" label="产品数量" :min-width="flexWidth('material_qty',crud.data,'分拣工单')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
export default {
name: 'OutKilnReport',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '入窑记录报表',
url: 'api/report/outKilnReport',
optShow: {
add: false,
edit: false,
del: false,
download: false
}
})
},
data() {
return {
permission: {
},
rules: {
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

67
lms/nladmin-ui/src/views/wms/ext/record/index.vue
View File

@@ -10,11 +10,11 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="对接编码">
<el-input v-model="form.interact_code" style="width: 370px;" disabled/>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="对接名称">
<el-input v-model="form.interact_name" style="width: 370px;" disabled/>
</el-form-item>
<el-form-item label="响应编码">
<el-input v-model="form.code" style="width: 370px;" disabled/>
@@ -23,10 +23,10 @@
<el-input v-model="form.message" style="width: 370px;" disabled/>
</el-form-item>
<el-form-item label="请求报文">
<el-input v-model="formattedRequestParam" :rows="7" type="textarea" style="width: 370px;"/>
<el-input v-model="formattedRequestParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;"/>
</el-form-item>
<el-form-item label="响应结果">
<el-input v-model="formattedResponseParam" :rows="7" type="textarea" style="width: 370px;" disabled/>
<el-input v-model="formattedResponseParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" disabled/>
</el-form-item>
<el-form-item label="记录时间">
<el-input v-model="form.record_time" style="width: 370px;" disabled/>
@@ -66,9 +66,9 @@
>
<el-table-column type="selection" width="55" />
<el-table-column
prop="interact_code"
label="对接编码"
:min-width="flexWidth('interact_code',crud.data,'对接编码')"
prop="interact_name"
label="对接名称"
:min-width="flexWidth('interact_name',crud.data,'对接名称')"
/>
<el-table-column prop="code" label="响应编码" :min-width="flexWidth('code',crud.data,'响应编码')" />
<el-table-column prop="message" label="响应信息" :min-width="flexWidth('message',crud.data,'响应信息')" />
@@ -124,7 +124,7 @@ import pagination from '@crud/Pagination'
const defaultForm = {
interact_id: null,
interact_code: null,
interact_name: null,
code: null,
message: null,
request_param: null,
@@ -144,7 +144,13 @@ export default {
url: 'api/sysInteractRecord',
idField: 'interact_id',
sort: 'interact_id,desc',
crudMethod: { ...crudSysInteractRecord }
crudMethod: { ...crudSysInteractRecord },
optShow: {
add: false,
edit: false,
del: true,
download: false
}
})
},
data() {
@@ -154,21 +160,32 @@ export default {
}
},
computed: {
formattedRequestParam() {
try {
const jsonObject = JSON.parse(this.form.request_param) // 解析 JSON 字符串为 JavaScript 对象
return JSON.stringify(jsonObject, null, 2) // 使用 null 和 2 来进行格式化
} catch (error) {
// 错误处理，如果 JSON 解析失败则返回原始字符串
return this.form.request_param
formattedRequestParam: {
get() {
try {
const jsonObject = JSON.parse(this.form.request_param) // 解析 JSON 字符串为 JavaScript 对象
return JSON.stringify(jsonObject, null, 2) // 使用 null 和 2 来进行格式化
} catch (error) {
// 错误处理，如果 JSON 解析失败则返回原始字符串
return this.form.request_param
}
},
set(value) {
this.form.request_param = value // 可以编辑响应结果并保存到数据属性中
}
}, formattedResponseParam() {
try {
const jsonObject = JSON.parse(this.form.response_param) // 解析 JSON 字符串为 JavaScript 对象
return JSON.stringify(jsonObject, null, 2) // 使用 null 和 2 来进行格式化
} catch (error) {
// 错误处理，如果 JSON 解析失败则返回原始字符串
return this.form.response_param
},
formattedResponseParam: {
get() {
try {
const jsonObject = JSON.parse(this.form.response_param) // 解析 JSON 字符串为 JavaScript 对象
return JSON.stringify(jsonObject, null, 2) // 使用 null 和 2 来进行格式化
} catch (error) {
// 错误处理，如果 JSON 解析失败则返回原始字符串
return this.form.response_param
}
},
set(value) {
this.form.response_param = value // 可以编辑响应结果并保存到数据属性中
}
}
},

2
lms/nladmin-ui/src/views/wms/pdm/residue/index.vue
View File

@@ -33,7 +33,7 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('raw_material_code',crud.data,'泥料编码')"/>
<el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')"/>
<el-table-column prop="weight" label="泥料编码" :min-width="flexWidth('weight',crud.data,'泥料编码')"/>
<el-table-column prop="weight" label="剩余重量" :min-width="flexWidth('weight',crud.data,'泥料编码')"/>
<el-table-column prop="workorder_code" label="工单号" :min-width="flexWidth('workorder_code',crud.data,'工单号')"/>
<el-table-column prop="record_time" label="记录时间" :min-width="flexWidth('record_time',crud.data,'记录时间')"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">