UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除任务同步相关调整（后续还需调整）

Browse Source
dev2.0
anthonywj 2 years ago
parent 5f0ed5705d
commit c83c5fd8d3
11 changed files with 140 additions and 55 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
Unescape Escape View File

@ -56,6 +56,12 @@ public enum BasicExportTypeEnum {
* 发票信息
*/
ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
/**
* 设备任务同步
*/
DEVICE_TASK("device_task", "设备任务"),
;
@EnumValue
private String key;

1
src/main/java/com/glxp/api/constant/SocketMsgType.java
Unescape Escape View File

@ -10,6 +10,7 @@ public interface SocketMsgType {
* 任务类型
*/
String TASK_INVOICE_CONFIRM = "TASK_INVOICE_CONFIRM"; //发票确认
String TASK_SYNC_DELETE = "TASK_SYNC_DELETE"; //同步删除
String BASIC_DATA_DELETE = "BASIC_DATA_DELETE"; //耗材字典删除

9
src/main/java/com/glxp/api/constant/BasicDataType.java → src/main/java/com/glxp/api/constant/SyncDelType.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.glxp.api.constant;
public interface BasicDataType {
public interface SyncDelType {
/**
* 耗材字典
@ -9,8 +9,13 @@ public interface BasicDataType {
String BASIC_MANAGE = "BASIC_MANAGE"; //供应商器械信息
String BASIC_CORP_MAINTAIN ="BASIC_CORP_MAINTAIN"; //往来信息维护
String BASIC_CORP_MAINTAIN = "BASIC_CORP_MAINTAIN"; //往来信息维护
String BASIC_BUSINESS_TYPE = "BASIC_BUSINESS_TYPE"; //单据类型设置
/**
* 设备任务
*/
String DEV_TASK = "DEV_TASK";
}

12
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -9,13 +9,13 @@ import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.sync.SpsSyncWebSocket;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.inv.InvProductEntity;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
@ -34,10 +34,7 @@ import com.glxp.api.service.inv.InvProductService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrDataService;
import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.udi.FilterUdiUtils;
import com.glxp.api.util.udi.UdiInfoUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -269,7 +266,7 @@ public class UdiRelevanceController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/deleteById")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
@Log(title = "耗材字典管理", businessType = BusinessType.DELETE)
public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest) {
String ids = deleteRequest.getId();
@ -292,13 +289,12 @@ public class UdiRelevanceController extends BaseController {
BasicDataRequest basicDataRequest = new BasicDataRequest();
basicDataRequest.setDeleteRequest(deleteRequest);
Long userId = getUserId();
basicDataRequest.setKey("BASIC_MAINTAIN");
basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN);
//推送
BasicDataRequest request = webSocketServer.insert(basicDataRequest, userId + "");
request.setDeleteRequest(deleteRequest);
webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.BASIC_DATA_DELETE).content(request).remark("耗材字典删除").build(), null);
return ResultVOUtils.success("删除成功");
return ResultVOUtils.success("删除成功");
}
@Resource

28
src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
Unescape Escape View File

@ -18,6 +18,8 @@ import com.glxp.api.constant.Constant;
import com.glxp.api.dao.auth.*;
import com.glxp.api.dao.basic.*;
import com.glxp.api.dao.inout.*;
import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper;
import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
import com.glxp.api.dao.purchase.*;
import com.glxp.api.dao.schedule.SystemParamConfigDao;
import com.glxp.api.dao.system.*;
@ -39,6 +41,8 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inout.IoAddInoutService;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
import com.glxp.api.service.inv.DeviceInspectTaskService;
import com.glxp.api.service.purchase.PurOrderDetailService;
import com.glxp.api.service.purchase.PurOrderService;
import com.glxp.api.service.sync.BasicDownloadService;
@ -371,6 +375,10 @@ public class SpsSyncDownloadController {
case SYS_SET_DATA:
saveUploadSysSettingData(JSONUtil.toBean(obj, SpsSyncSysSettingResponse.class));
break;
case DEVICE_TASK:
saveUploadDevTask(JSONUtil.toBean(obj, SpsSyncDeviceTaskResponse.class));
break;
}
String taskId = obj.getStr("taskId");
BasicDownloadStatusEntity downloadStatus = BasicDownloadStatusEntity.builder()
@ -604,6 +612,26 @@ public class SpsSyncDownloadController {
}
}
@Resource
DeviceInspectTaskMapper deviceInspectTaskMapper;
@Resource
DeviceInspectTaskDetailMapper deviceInspectTaskDetailMapper;
/**
* 保存上传的设备任务信息
*
* @param bean
*/
private void saveUploadDevTask(SpsSyncDeviceTaskResponse bean) {
if (CollectionUtil.isNotEmpty(bean.getDeviceInspectTaskEntities())) {
deviceInspectTaskMapper.replaceBatchs(bean.getDeviceInspectTaskEntities());
}
if (CollectionUtil.isNotEmpty(bean.getDeviceInspectTaskDetailEntities())) {
deviceInspectTaskDetailMapper.replaceBatchs(bean.getDeviceInspectTaskDetailEntities());
}
}
@Resource
IoOrderDao orderDao;
@Resource

19
src/main/java/com/glxp/api/controller/sync/SpsSyncWebSocket.java
Unescape Escape View File

@ -1,14 +1,12 @@
package com.glxp.api.controller.sync;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.entity.sync.SyncEditLogEntity;
import com.glxp.api.entity.sync.SyncEditTypeEntity;
import com.glxp.api.req.basic.BasicDataRequest;
import com.glxp.api.req.basic.DeleteBasicDataRequest;
import com.glxp.api.service.CustomService;
import com.glxp.api.service.sync.SyncEditLogService;
import com.glxp.api.service.sync.SyncEditTypeService;
import com.glxp.api.util.JsonUtils;
@ -123,13 +121,13 @@ public class SpsSyncWebSocket {
}
}
public BasicDataRequest insert( BasicDataRequest basicDataRequest, String userId){
public BasicDataRequest insert(BasicDataRequest basicDataRequest, String userId) {
//日志参数类
DeleteBasicDataRequest deleteBasicDataRequest = new DeleteBasicDataRequest();
deleteBasicDataRequest.setRecordCode("DL"+new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(System.currentTimeMillis()));
deleteBasicDataRequest.setRecordCode("DL" + new SimpleDateFormat("yyyyMMddHHmmssSSSS").format(System.currentTimeMillis()));
deleteBasicDataRequest.setUserId(userId);
switch (basicDataRequest.getKey()){
case "BASIC_MAINTAIN":
switch (basicDataRequest.getKey()) {
case SyncDelType.BASIC_MAINTAIN:
deleteBasicDataRequest.setDataType(basicDataRequest.getKey());
deleteBasicDataRequest.setParam(JSONUtil.toJsonStr(basicDataRequest.getDeleteRequest()) + basicDataRequest.getKey());
deleteBasicDataRequest.setName("耗材字典维护");
@ -158,16 +156,17 @@ public class SpsSyncWebSocket {
}
//插入日志
insertLog(deleteBasicDataRequest,userId);
insertLog(deleteBasicDataRequest, userId);
insertType(deleteBasicDataRequest);
return basicDataRequest;
}
@Resource
SyncEditLogService syncEditLogService;
@Resource
SyncEditTypeService syncEditTypeService;
public void insertLog(DeleteBasicDataRequest deleteBasicDataRequest, String userId){
public void insertLog(DeleteBasicDataRequest deleteBasicDataRequest, String userId) {
SyncEditLogEntity syncEditLogEntity = new SyncEditLogEntity();
syncEditLogEntity.setRecordCode(deleteBasicDataRequest.getRecordCode());
syncEditLogEntity.setOperType(2);
@ -181,7 +180,7 @@ public class SpsSyncWebSocket {
syncEditLogService.insertLog(syncEditLogEntity);
}
public void insertType(DeleteBasicDataRequest deleteBasicDataRequest){
public void insertType(DeleteBasicDataRequest deleteBasicDataRequest) {
SyncEditTypeEntity syncEditTypeEntity = new SyncEditTypeEntity();
syncEditTypeEntity.setCode(deleteBasicDataRequest.getDataType());
syncEditTypeEntity.setName(deleteBasicDataRequest.getName());

65
src/main/java/com/glxp/api/controller/basic/BasicDataController.java → src/main/java/com/glxp/api/controller/sync/SyncDelController.java
Unescape Escape View File

@ -1,17 +1,18 @@
package com.glxp.api.controller.basic;
package com.glxp.api.controller.sync;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicDataType;
import com.glxp.api.constant.SocketMsgType;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.sync.SocketMsgEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.entity.sync.SyncEditLogEntity;
import com.glxp.api.entity.sync.SyncEditTypeEntity;
import com.glxp.api.req.basic.*;
@ -22,9 +23,10 @@ import com.glxp.api.service.auth.WarehouseBussinessTypeService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.inout.IoCodeService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
import com.glxp.api.service.inv.DeviceInspectTaskService;
import com.glxp.api.service.sync.SyncEditLogService;
import com.glxp.api.service.sync.SyncEditTypeService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@ -35,15 +37,13 @@ import java.util.List;
@RestController
public class BasicDataController extends BaseController {
public class SyncDelController extends BaseController {
@Resource
SyncEditLogService syncEditLogService;
@Resource
SyncEditTypeService syncEditTypeService;
@Resource
BasicBussinessTypeController basicBussinessTypeController;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
IoCodeService codeService;
@ -64,42 +64,48 @@ public class BasicDataController extends BaseController {
@Resource
WarehouseBussinessTypeService warehouseBussinessTypeService;
//手持终端下载UDI产品信息
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basicData/deleteBasicData")
public BaseResponse downloadProducts(@RequestBody BasicDataRequest basicDataRequest) {
BaseResponse baseResponse = null;
switch (basicDataRequest.getKey()) {
case BasicDataType.BASIC_MAINTAIN:
case SyncDelType.BASIC_MAINTAIN:
//耗材字典
baseResponse = deleteById(basicDataRequest.getDeleteRequest());
//插入日志
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse, basicDataRequest.getDeleteBasicDataRequest().getUserId());
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
//插入操作数据类型记录表
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
case BasicDataType.BASIC_MANAGE:
case SyncDelType.BASIC_MANAGE:
//供应商器械信息
baseResponse = deleteCompanyProductRelevance(basicDataRequest.getDeleteCompanyFileRequest());
//插入日志
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse, basicDataRequest.getDeleteBasicDataRequest().getUserId());
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
//插入操作数据类型记录表
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
case BasicDataType.BASIC_CORP_MAINTAIN:
case SyncDelType.BASIC_CORP_MAINTAIN:
//往来信息维护
baseResponse = deleteBasicUnitMaintain(basicDataRequest.getDeleteRequest());
//插入日志
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse, basicDataRequest.getDeleteBasicDataRequest().getUserId());
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
//插入操作数据类型记录表
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
case BasicDataType.BASIC_BUSINESS_TYPE:
case SyncDelType.BASIC_BUSINESS_TYPE:
//单据类型设置
baseResponse = deleteBussinessType(basicDataRequest.getDeleteRequest());
//插入日志
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse, basicDataRequest.getDeleteBasicDataRequest().getUserId());
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
//插入操作数据类型记录表
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
case SyncDelType.DEV_TASK:
baseResponse = deleteDevTask(basicDataRequest.getDeviceInspectTaskEntity());
//插入日志
insertLog(basicDataRequest.getDeleteBasicDataRequest(), baseResponse);
//插入操作数据类型记录表
insertType(basicDataRequest.getDeleteBasicDataRequest());
break;
@ -110,7 +116,7 @@ public class BasicDataController extends BaseController {
}
public void insertLog(DeleteBasicDataRequest deleteBasicDataRequest, BaseResponse response, String userId) {
public void insertLog(DeleteBasicDataRequest deleteBasicDataRequest, BaseResponse response) {
SyncEditLogEntity syncEditLogEntity = new SyncEditLogEntity();
syncEditLogEntity.setRecordCode(deleteBasicDataRequest.getRecordCode());
syncEditLogEntity.setOperType(2);
@ -118,7 +124,7 @@ public class BasicDataController extends BaseController {
syncEditLogEntity.setParam(deleteBasicDataRequest.getParam());
syncEditLogEntity.setJsonResult(JSON.toJSONString(response.getData()));
syncEditLogEntity.setDirectType(2);
syncEditLogEntity.setOperUser(userId);
syncEditLogEntity.setOperUser(deleteBasicDataRequest.getUserId());
syncEditLogEntity.setUpdateTime(new Date());
syncEditLogService.insertLog(syncEditLogEntity);
}
@ -130,7 +136,7 @@ public class BasicDataController extends BaseController {
syncEditTypeService.insertType(syncEditTypeEntity);
}
public BaseResponse deleteById( DeleteRequest deleteRequest) {
public BaseResponse deleteById(DeleteRequest deleteRequest) {
String ids = deleteRequest.getId();
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(Long.parseLong(ids));
@ -152,13 +158,13 @@ public class BasicDataController extends BaseController {
}
public BaseResponse deleteCompanyProductRelevance( DeleteCompanyFileRequest deleteCompanyFileRequest) {
public BaseResponse deleteCompanyProductRelevance(DeleteCompanyFileRequest deleteCompanyFileRequest) {
boolean b = udiRlSupService.deleteById(deleteCompanyFileRequest.getId());
return ResultVOUtils.success("成功");
}
public BaseResponse deleteBasicUnitMaintain( DeleteRequest deleteRequest) {
public BaseResponse deleteBasicUnitMaintain(DeleteRequest deleteRequest) {
String id = deleteRequest.getId();
@ -171,7 +177,7 @@ public class BasicDataController extends BaseController {
}
public BaseResponse deleteBussinessType( DeleteRequest deleteRequest) {
public BaseResponse deleteBussinessType(DeleteRequest deleteRequest) {
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -198,9 +204,18 @@ public class BasicDataController extends BaseController {
}
return basicBussinessTypeService.deleteBussinessType(id) == true ? ResultVOUtils.success("删除成功") : ResultVOUtils.error(500, "删除失败，系统繁忙");
}
@Resource
DeviceInspectTaskService deviceInspectTaskService;
@Resource
DeviceInspectTaskDetailService deviceInspectTaskDetailService;
public BaseResponse deleteDevTask(DeviceInspectTaskEntity deviceInspectTaskEntity) {
deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity);
deviceInspectTaskDetailService.remove(new QueryWrapper<DeviceInspectTaskDetailEntity>().eq("taskOrderIdFk", deviceInspectTaskEntity.getOrderId()));
return ResultVOUtils.success("删除成功");
}
}

5
src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java
Unescape Escape View File

@ -1,7 +1,10 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.dao.purchase.SupCompanyDao;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.entity.purchase.SupCompanyEntity;
import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
import com.glxp.api.res.inv.DeviceInspectTakeResponse;
import org.apache.ibatis.annotations.Mapper;
@ -9,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface DeviceInspectTaskMapper extends BaseMapper<DeviceInspectTaskEntity> {
public interface DeviceInspectTaskMapper extends BaseMapperPlus<DeviceInspectTaskMapper, DeviceInspectTaskEntity, DeviceInspectTaskEntity> {
List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest);
}

3
src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java
Unescape Escape View File

@ -6,11 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "device_inspect_task")
public class DeviceInspectTaskEntity{
public class DeviceInspectTaskEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Long id;

29
src/main/java/com/glxp/api/req/basic/BasicDataRequest.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.req.basic;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.req.system.DeleteCompanyFileRequest;
import com.glxp.api.req.system.DeleteRequest;
import lombok.Data;
@ -7,12 +8,26 @@ import org.springframework.validation.BindingResult;
@Data
public class BasicDataRequest {
//耗材字典
private DeleteRequest deleteRequest;
//供应商器械信息
private DeleteCompanyFileRequest deleteCompanyFileRequest;
//日志参数类
private DeleteBasicDataRequest deleteBasicDataRequest;
private String key;
/**
* 耗材字典
*/
private DeleteRequest deleteRequest;
/**
* 供应商器械信息
*/
private DeleteCompanyFileRequest deleteCompanyFileRequest;
/**
* 日志参数类
*/
private DeleteBasicDataRequest deleteBasicDataRequest;
/**
* 设备任务删除参数
*/
private DeviceInspectTaskEntity deviceInspectTaskEntity;
private String key;
}

16
src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.glxp.api.res.sync;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import lombok.Data;
import java.util.List;
@Data
public class SpsSyncDeviceTaskResponse extends BaseSyncResponse {
List<DeviceInspectTaskEntity> deviceInspectTaskEntities;
List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntities;
}
Write Preview
Loading…
Cancel
Save