|
@@ -1,25 +1,24 @@
|
|
package com.om.service.impl;
|
|
package com.om.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
-import cn.hutool.core.util.PageUtil;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
-import com.om.entity.dto.DiagnosisInfoDTO;
|
|
|
|
import com.om.entity.dto.UpStatusDto;
|
|
import com.om.entity.dto.UpStatusDto;
|
|
-import com.om.entity.po.*;
|
|
|
|
|
|
+import com.om.entity.po.Brand;
|
|
|
|
+import com.om.entity.po.DiagnosisVersionDescribe;
|
|
|
|
+import com.om.entity.po.DiagnosisVersionInfo;
|
|
import com.om.entity.vo.DiagnosisVersionVO;
|
|
import com.om.entity.vo.DiagnosisVersionVO;
|
|
import com.om.entity.vo.DignosisPageVO;
|
|
import com.om.entity.vo.DignosisPageVO;
|
|
import com.om.mapper.DiagnosisVersionInfoMapper;
|
|
import com.om.mapper.DiagnosisVersionInfoMapper;
|
|
-import com.om.service.*;
|
|
|
|
|
|
+import com.om.service.IBrandService;
|
|
|
|
+import com.om.service.IClientService;
|
|
|
|
+import com.om.service.IDiagnosisVersionDescribeService;
|
|
|
|
+import com.om.service.IDiagnosisVersionInfoService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.om.utils.Result;
|
|
import com.om.utils.Result;
|
|
-import com.om.utils.UserContext;
|
|
|
|
import io.swagger.v3.oas.annotations.parameters.RequestBody;
|
|
import io.swagger.v3.oas.annotations.parameters.RequestBody;
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.util.List;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
@@ -38,19 +37,11 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
|
|
IBrandService brandService;
|
|
IBrandService brandService;
|
|
@Resource
|
|
@Resource
|
|
IClientService clientService;
|
|
IClientService clientService;
|
|
- @Resource
|
|
|
|
- IUserService userService;
|
|
|
|
@Override
|
|
@Override
|
|
public Result add(DiagnosisVersionVO diagnosisVersionVO) {
|
|
public Result add(DiagnosisVersionVO diagnosisVersionVO) {
|
|
DiagnosisVersionInfo info = new DiagnosisVersionInfo();
|
|
DiagnosisVersionInfo info = new DiagnosisVersionInfo();
|
|
- //copy了文件地址和名称,品牌名称,文件大小
|
|
|
|
|
|
+ //copy了文件地址和名称,品牌名称
|
|
BeanUtil.copyProperties(diagnosisVersionVO,info);
|
|
BeanUtil.copyProperties(diagnosisVersionVO,info);
|
|
- //获取user用户。保存当前操作人
|
|
|
|
- Integer userId = UserContext.getUserId();
|
|
|
|
- User user = userService.getById(userId);
|
|
|
|
- info.setUsername(user.getUsername());
|
|
|
|
- info.setVersionNum("1.0");
|
|
|
|
- info.setStatus(0);
|
|
|
|
this.save(info);
|
|
this.save(info);
|
|
LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
|
|
queryWrapper.eq(DiagnosisVersionInfo::getFile,diagnosisVersionVO.getFile());
|
|
queryWrapper.eq(DiagnosisVersionInfo::getFile,diagnosisVersionVO.getFile());
|
|
@@ -95,62 +86,32 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
|
|
if (versionInfo == null){
|
|
if (versionInfo == null){
|
|
return Result.ok();
|
|
return Result.ok();
|
|
}
|
|
}
|
|
- DiagnosisInfoDTO diagnosisInfo = new DiagnosisInfoDTO();
|
|
|
|
- diagnosisInfo.setId(id);
|
|
|
|
- diagnosisInfo.setBrandName(versionInfo.getBrandCode());
|
|
|
|
- //根据客户端信息,获取客户端名称
|
|
|
|
- LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
- queryWrapper.eq(Client::getName,diagnosisInfo.getClientName());
|
|
|
|
- Client client = clientService.getOne(queryWrapper);
|
|
|
|
-
|
|
|
|
- diagnosisInfo.setClientName(client.getName());
|
|
|
|
- diagnosisInfo.setCreateTime(versionInfo.getCreateTime());
|
|
|
|
- diagnosisInfo.setDiagnosisName(versionInfo.getDiagnosisName());
|
|
|
|
- diagnosisInfo.setFileSize(versionInfo.getDiagnosisFileSize());
|
|
|
|
- diagnosisInfo.setSecret(versionInfo.getCipherCode());
|
|
|
|
- diagnosisInfo.setStatus(diagnosisInfo.getStatus());
|
|
|
|
- diagnosisInfo.setUsername(diagnosisInfo.getUsername());
|
|
|
|
- diagnosisInfo.setVersion(versionInfo.getVersionNum());
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- return Result.ok(diagnosisInfo);
|
|
|
|
|
|
+
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public Result getDesc(DiagnosisVersionVO diagnosisVersionVO) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result getPageList(DignosisPageVO dignosisPageVO) {
|
|
public Result getPageList(DignosisPageVO dignosisPageVO) {
|
|
-
|
|
|
|
- Page<DiagnosisVersionInfo> page = this.lambdaQuery()
|
|
|
|
- .like(StringUtils.isNotBlank(dignosisPageVO.getQuery()),DiagnosisVersionInfo::getUsername,dignosisPageVO.getQuery())
|
|
|
|
- .page(new Page<>(dignosisPageVO.getPageIndex(),dignosisPageVO.getPageSize()));
|
|
|
|
- return Result.ok(page);
|
|
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result release(Integer id) {
|
|
public Result release(Integer id) {
|
|
- DiagnosisVersionInfo info = this.getById(id);
|
|
|
|
- info.setStatus(1);
|
|
|
|
- this.update(info,null);
|
|
|
|
- return Result.ok();
|
|
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result repeal(Integer id) {
|
|
public Result repeal(Integer id) {
|
|
- DiagnosisVersionInfo info = this.getById(id);
|
|
|
|
- info.setStatus(0);
|
|
|
|
- this.update(info,null);
|
|
|
|
- return Result.ok();
|
|
|
|
|
|
+ return null;
|
|
}
|
|
}
|
|
|
|
|
|
- /*
|
|
|
|
- 目前用不上
|
|
|
|
- */
|
|
|
|
@Override
|
|
@Override
|
|
public Result upStatus(UpStatusDto upStatusDto) {
|
|
public Result upStatus(UpStatusDto upStatusDto) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
- @Override
|
|
|
|
- public Result getDesc(DiagnosisVersionVO diagnosisVersionVO) {
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|