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

代码备份

Browse Source
udims_mango
anthonywj 4 years ago
parent 11ed144b8d
commit 645211f788
475 changed files with 1047 additions and 263 deletions

2
api-udims/pom.xml
Unescape Escape View File

@ -155,7 +155,7 @@
<build>
<finalName>UDIC_SALE_Server</finalName>
<finalName>UDIC_UDI_Server</finalName>
<plugins>
<plugin>

2
api-udims/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -176,7 +176,7 @@ public class AuthAdminController {
if (authAdmin.getPassWord() != null) {
authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
}
authAdmin.setCustomerId((long) 110);
authAdmin.setCustomerId( authAdminSaveRequest.getCustomerId()); //测试用
boolean b = authAdminService.insertAuthAdmin(authAdmin);
authAdmin = authAdminService.findByUserName(authAdmin.getUserName());

34
api-udims/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java
Unescape Escape View File

@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@RestController
@ -34,7 +35,7 @@ public class CustomerController {
@Resource
private CustomerContactService customerContactService;
@Resource
private UserRegisterService userRegisterService;
private UserRegisterService userRegisterService;
@Resource
private AuthAdminService authAdminService;
@Resource
@ -74,20 +75,33 @@ public class CustomerController {
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity);
boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity);
if(customerDetailEntity.getUserFlag()!=null){
if (customerDetailEntity.getUserFlag() != null) {
UpdateUserflagBean userflagBean = new UpdateUserflagBean();
userflagBean.setCustomerId(customerDetailEntity.getCustomerId());
userflagBean.setUserFlag(customerDetailEntity.getUserFlag());
authAdminService.updateUserByCustomerId(userflagBean);
}
// CustomerContactEntity customerContactEntity = new CustomerContactEntity();
// BeanUtils.copyProperties(customerContactEntity, customerContactEntity);
// boolean c = customerContactService.updateCustomerContact(customerContactEntity);
if (!b ) {
//更新角色
List<Long> roles = new ArrayList<>();
List<AuthAdmin> authAdmins = authAdminService.findByCustomerId(customerDetailEntity.getCustomerId());
if (authAdmins != null && authAdmins.size() > 0) {
for (AuthAdmin authAdmin : authAdmins) {
authRoleAdminService.deleteByAdminId(authAdmin.getId());
if (customerDetailEntity.getRoleId() != null) {
roles.add(Long.parseLong(customerDetailEntity.getRoleId()));
authRoleAdminService.insertRolesAdminIdAll(roles, authAdmin.getId());
}
}
}
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("更新成功");
}
@PostMapping("salewarehouse/customer/modify")
public BaseResponse modifyCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity,
BindingResult bindingResult) {
@ -102,7 +116,7 @@ public class CustomerController {
CustomerContactEntity customerContactEntity = new CustomerContactEntity();
BeanUtils.copyProperties(customerDetailEntity, customerContactEntity);
boolean c = customerContactService.updateCustomerContact(customerContactEntity);
if (!b ) {
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("更新成功");
@ -121,9 +135,9 @@ public class CustomerController {
userRegisterService.deleteByCustomerId(Long.parseLong(id));
List<AuthAdmin> authAdmins = authAdminService.findByCustomerId(Long.parseLong(id));
if(authAdmins!=null && authAdmins.size()>0){
for(int i =0;i<authAdmins.size();i++){
List<AuthAdmin> authAdmins = authAdminService.findByCustomerId(Long.parseLong(id));
if (authAdmins != null && authAdmins.size() > 0) {
for (int i = 0; i < authAdmins.size(); i++) {
authRoleAdminService.deleteByAdminId(authAdmins.get(i).getId());
}
}

5
api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java
Unescape Escape View File

@ -263,7 +263,7 @@ public class RegisterController {
customerInfoEntity.setCreditNum(userRegisterEntity.getCreditNum());
customerInfoEntity.setCustomerName(userRegisterEntity.getNickName());
customerInfoEntity.setUserFlag(1);
customerInfoEntity.setUserMax(10);
customerInfoEntity.setUserMax(2);
customerInfoEntity.setRoleId(registerCheckRequest.getRoles()+"");
customerInfoEntity.setCompanyName(userRegisterEntity.getCompanyName());
List<Long> roles = new ArrayList<>();
@ -288,13 +288,14 @@ public class RegisterController {
CompanyEntity companyEntity = new CompanyEntity();
companyEntity.setCustomerId(userId);
companyEntity.setArea(userRegisterEntity.getArea());
companyEntity.setAreaCode(userRegisterEntity.getAreaCode());
companyEntity.setDetailAddr(userRegisterEntity.getDetailAddr());
companyEntity.setContacts(customerContactEntity.getContacts());
companyEntity.setEmail(userRegisterEntity.getEmail());
companyEntity.setMobile(userRegisterEntity.getMobile());
companyEntity.setTel(userRegisterEntity.getTel());
companyEntity.setCompanyName(userRegisterEntity.getCompanyName());
companyEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus());
companyEntity.setClasses(userRegisterEntity.getBussinessStatus()+"");
companyEntity.setCreditNum(userRegisterEntity.getCreditNum());
companyService.insertCompany(companyEntity);

138
api-udims/src/main/java/com/glxp/udi/admin/controller/device/DeviceController.java
Unescape Escape View File

@ -1,15 +1,21 @@
package com.glxp.udi.admin.controller.device;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.dao.udid.DeviceMapper;
import com.glxp.udi.admin.dao.udid.DevicedownloadMapper;
import com.glxp.udi.admin.entity.auth.AuthAdmin;
import com.glxp.udi.admin.entity.info.CompanyEntity;
import com.glxp.udi.admin.entity.udid.*;
import com.glxp.udi.admin.exception.JsonException;
import com.glxp.udi.admin.req.udid.*;
import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.res.udid.ProgressResponse;
import com.glxp.udi.admin.service.auth.AuthAdminService;
import com.glxp.udi.admin.service.info.CompanyService;
import com.glxp.udi.admin.service.inout.DeviceService;
import com.glxp.udi.admin.service.inout.DruginfoService;
import com.glxp.udi.admin.service.publish.UdiDeviceIdService;
import com.glxp.udi.common.enums.ResultEnum;
import com.glxp.udi.common.res.BaseResponse;
import com.glxp.udi.common.util.ResultVOUtils;
@ -19,8 +25,11 @@ 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;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@ -32,6 +41,8 @@ public class DeviceController {
DeviceMapper deviceMapper;
@Resource
DruginfoService druginfoService;
@Resource
AuthAdminService authAdminService;
@Resource
private DeviceService deviceService;
@ -82,11 +93,9 @@ public class DeviceController {
}
String key = deviceListRequest.getKey();
boolean isScan = false;
if (key != null && key.length() > 22) {
key = key.substring(2, 16);
deviceListRequest.setKey(key);
isScan = true;
}
Device device = deviceService.searchByBs(key);
long total = 1;
@ -121,14 +130,19 @@ public class DeviceController {
pageSimpleResponse.setList(deviceEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("warehouse/device/unionSearch")
public BaseResponse search(@Valid DeviceSearchRequest deviceSearchRequest, BindingResult bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
deviceSearchRequest.setCustomerId(authAdmin.getCustomerId()+"");
List<DeviceEntity> medicalResonseList = deviceService.search(deviceSearchRequest);
long total = deviceService.seatchTotal(deviceSearchRequest);
PageSimpleResponse<DeviceEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -137,6 +151,20 @@ public class DeviceController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Resource
UdiDeviceIdService udiDeviceIdService;
@GetMapping("warehouse/device/downloadAll")
public BaseResponse downloadAll() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return ResultVOUtils.success("下载成功");
}
@GetMapping("warehouse/device/combineSearch")
public BaseResponse combineSearch(@Valid DeviceSearchRequest deviceSearchRequest, BindingResult bindingResult) {
@ -155,11 +183,11 @@ public class DeviceController {
total = devicedownload.getAlltotal() - devicedownload.getAllindex();
}
for (int i = 0;i<medicalResonseList.size();i++){
for (int i = 0; i < medicalResonseList.size(); i++) {
String nameCode = medicalResonseList.get(i).getZxxsdycpbs();
if(druginfoService.isExit(nameCode)){
if (druginfoService.isExit(nameCode)) {
medicalResonseList.get(i).setCheck(true);
}else
} else
medicalResonseList.get(i).setCheck(false);
}
@ -168,12 +196,20 @@ public class DeviceController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("warehouse/device/loadsingle")
public BaseResponse downLoadDiii(@RequestBody DeviceDiRequest deviceRequest) {
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService);
if(deviceRequest.getPrimaryDeviceId() == null){
return ResultVOUtils.error(999,"最小销售单元标识不能为空");
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyEntity);
if (deviceRequest.getPrimaryDeviceId() == null) {
return ResultVOUtils.error(999, "最小销售单元标识不能为空");
}
new Thread(() -> {
@ -181,7 +217,7 @@ public class DeviceController {
DownloadDiRequest downloadDiRequest1 = new DownloadDiRequest();
downloadDiRequest1.setAccessToken(token.getAccessToken());
downloadDiRequest1.setPrimaryDeviceId(deviceRequest.getPrimaryDeviceId());
int result = downloadDeviceHelper.downloadBydi( downloadDiRequest1,deviceService);
int result = downloadDeviceHelper.downloadBydi(authAdmin.getCustomerId()+"",downloadDiRequest1, deviceService);
if (result == -1) {
return;// ResultVOUtils.error(505, "下载出错");
}
@ -192,9 +228,17 @@ public class DeviceController {
@PostMapping("warehouse/device/downLoadHisory")
public BaseResponse downLoadHisory(@RequestBody DeviceDiRequest deviceRequest) {
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService);
if(deviceRequest.getPrimaryDeviceId() == null){
return ResultVOUtils.error(999,"最小销售单元标识不能为空");
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyEntity);
if (deviceRequest.getPrimaryDeviceId() == null) {
return ResultVOUtils.error(999, "最小销售单元标识不能为空");
}
new Thread(() -> {
String deviceRecordKey = deviceService.selectKey(deviceRequest.getPrimaryDeviceId());
@ -202,12 +246,12 @@ public class DeviceController {
DownloadHistoryRequest deviceHistoryRequest = new DownloadHistoryRequest();
deviceHistoryRequest.setAccessToken(token.getAccessToken());
deviceHistoryRequest.setCurrentPageNumber("1");
List< DownloadHistoryRequest.DataSetBean> dataSetBeans = new ArrayList<>();
List<DownloadHistoryRequest.DataSetBean> dataSetBeans = new ArrayList<>();
DownloadHistoryRequest.DataSetBean keys = new DownloadHistoryRequest.DataSetBean();
keys.setDeviceRecordKey(deviceRecordKey);
dataSetBeans.add(keys);
deviceHistoryRequest.setDataSet(dataSetBeans);
int result = downloadDeviceHelper.downloadHistory(deviceHistoryRequest, deviceService);
int result = downloadDeviceHelper.downloadHistory(authAdmin.getCustomerId()+"",deviceHistoryRequest, deviceService);
if (result == -1) {
return;// ResultVOUtils.error(505, "下载出错");
}
@ -217,9 +261,18 @@ public class DeviceController {
}
@PostMapping("warehouse/device/loadudid")
public BaseResponse downLoadAll(DownloadDeviceRequest downloadDeviceRequest, BindingResult bindingResult) {
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService);
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyEntity);
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
@ -228,22 +281,22 @@ public class DeviceController {
TokenEntity token = downloadDeviceHelper.getToken();
int total = downloadDeviceHelper.getTotal(token.getAccessToken());
int curpage = total;
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey("udid");
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey(authAdmin.getCustomerId() + "");
if (devicedownload != null) {
int offset = devicedownload.getAlltotal() - devicedownload.getAllindex();
curpage = total - offset;
} else {
devicedownload= new Devicedownload();
devicedownload.setId("udid");
devicedownload = new Devicedownload();
devicedownload.setId(authAdmin.getCustomerId() + "");
devicedownload.setAlltotal(100);
devicedownload.setAllindex(99);
devicedownload.setAllindex(100);
devicedownloadMapper.insert(devicedownload);
}
devicedownload.setIsdownload(1);
long startTime = System.currentTimeMillis();
devicedownload.setStarttime(startTime + "");
devicedownloadMapper.updateByPrimaryKey(devicedownload);
Devicedownload stop = devicedownloadMapper.selectByPrimaryKey("udid");
Devicedownload stop = devicedownloadMapper.selectByPrimaryKey(authAdmin.getCustomerId() + "");
while (curpage > 0 && stop.getIsdownload() == 1 && stop.getStarttime().equals(startTime + "")) {
@ -251,7 +304,7 @@ public class DeviceController {
deviceRequest.setAccessToken(token.getAccessToken());
deviceRequest.setRequestType(3 + "");
deviceRequest.setCurrentPageNumber(curpage + "");
int result = downloadDeviceHelper.downloadDevices(deviceService, deviceRequest);
int result = downloadDeviceHelper.downloadProduct(authAdmin.getCustomerId()+"",deviceService, deviceRequest);
if (result == -1) {
return;// ResultVOUtils.error(505, "下载出错");
}
@ -259,24 +312,24 @@ public class DeviceController {
Devicedownload devicedownload1 = new Devicedownload();
devicedownload1.setAlltotal(total);
devicedownload1.setAllindex(curpage);
devicedownload1.setId("udid");
devicedownload1.setId(authAdmin.getCustomerId() + "");
devicedownloadMapper.updateProgress(devicedownload1);
stop = devicedownloadMapper.selectByPrimaryKey("udid");
stop = devicedownloadMapper.selectByPrimaryKey(authAdmin.getCustomerId() + "");
}
}).start();
// Devicedownload devicedownload1 = new Devicedownload();
// devicedownload1.setAlltotal(total);
// devicedownload1.setAllindex(curpage + 1);
// devicedownload1.setId("udid");
// devicedownloadMapper.updateByExample(devicedownload1, new DevicedownloadExample());
return ResultVOUtils.success("开始下载");
}
@GetMapping("warehouse/device/stop")
public BaseResponse stopDown() {
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey("udid");
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey(authAdmin.getCustomerId()+"");
devicedownload.setIsdownload(2);
devicedownloadMapper.updateByPrimaryKey(devicedownload);
return ResultVOUtils.success("停止成功");
@ -284,7 +337,14 @@ public class DeviceController {
@GetMapping("warehouse/device/progress")
public BaseResponse getProgress() {
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey("udid");
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey(authAdmin.getCustomerId()+"");
ProgressResponse response = new ProgressResponse();
if (devicedownload != null) {
double index = devicedownload.getAlltotal() - devicedownload.getAllindex();
@ -297,9 +357,9 @@ public class DeviceController {
response.setIndex(index * 10);
response.setProgress(progress * 100);
} else {
response.setTotal(100);
response.setIndex(1);
response.setProgress(1);
response.setTotal(1000);
response.setIndex(0);
response.setProgress(0);
}
return ResultVOUtils.success(response);

124
api-udims/src/main/java/com/glxp/udi/admin/controller/device/DownloadDeviceHelper.java
Unescape Escape View File

@ -14,7 +14,6 @@ import com.glxp.udi.admin.res.udid.DataSetBean;
import com.glxp.udi.admin.res.udid.MedicalHistoryResonse;
import com.glxp.udi.admin.res.udid.MedicalResonse;
import com.glxp.udi.admin.res.udid.MedicalSingleResponse;
import com.glxp.udi.admin.service.info.CompanyService;
import com.glxp.udi.admin.service.inout.DeviceService;
import com.glxp.udi.admin.util.HttpClient;
import com.glxp.udi.admin.util.WarehousBeanUtils;
@ -32,19 +31,19 @@ public class DownloadDeviceHelper {
String appId;
String appSecret;
public DownloadDeviceHelper(CompanyService companyService) {
long customerId = 110;
companyEntity = companyService.findCompany(customerId);
if (companyEntity != null && companyEntity.getClasses() != null) {
if (companyEntity.getClasses().equals("1")) {
url = "company/identifier/get";
} else {
url = "sharing/get";
}
appId = companyEntity.getAppId();
appSecret = companyEntity.getAppSecret();
}
}
// public DownloadDeviceHelper(CompanyService companyService) {
// long customerId = 110;
// companyEntity = companyService.findCompany(customerId);
// if (companyEntity != null && companyEntity.getClasses() != null) {
// if (companyEntity.getClasses().equals("1")) {
// url = "company/identifier/get";
// } else {
// url = "sharing/get";
// }
// appId = companyEntity.getAppId();
// appSecret = companyEntity.getAppSecret();
// }
// }
public DownloadDeviceHelper(CompanyEntity companyEntity) {
@ -67,21 +66,19 @@ public class DownloadDeviceHelper {
}
//产品数据申报
public int getTotal(String token) {
DeviceRequest deviceRequest = new DeviceRequest();
deviceRequest.setCurrentPageNumber("1");
deviceRequest.setRequestType("3");
deviceRequest.setAccessToken(token);
String response = HttpClient.post(url, deviceRequest);
String response = HttpClient.post("company/identifier/get", deviceRequest);
MedicalResonse medicalResonse = (MedicalResonse) JSONObject.parseObject(response, MedicalResonse.class);
return medicalResonse.getTotalPageCount();
}
//下载流通企业
public int downloadDevices(DeviceService deviceService, DeviceRequest deviceRequest) {
String response = HttpClient.post(url, deviceRequest);
String response = HttpClient.post("sharing/get", deviceRequest);
int result = -1;
List<DataSetBean> dataSetBeanList;
if (url.equals("sharing/get")) {
@ -121,7 +118,7 @@ public class DownloadDeviceHelper {
keys.setDeviceRecordKey(device.getDevicerecordkey());
dataSetBeans.add(keys);
deviceHistoryRequest.setDataSet(dataSetBeans);
downloadHistory(deviceHistoryRequest, deviceService);
downloadHistory("",deviceHistoryRequest, deviceService);
}
deviceService.insertDevice(device);
@ -184,8 +181,8 @@ public class DownloadDeviceHelper {
}
//下载生产企业
public int downloadProduct(DeviceService deviceService, DeviceRequest deviceRequest) {
String response = HttpClient.post(url, deviceRequest);
public int downloadProduct(String customerId,DeviceService deviceService, DeviceRequest deviceRequest) {
String response = HttpClient.post("company/identifier/get", deviceRequest);
MedicalHistoryResonse medicalResonse = (MedicalHistoryResonse) JSONObject.parseObject(response, MedicalHistoryResonse.class);
if (medicalResonse.getReturnCode() == 1) {
List<DataSetBean> dataSetBeanList = medicalResonse.getDataList();
@ -193,10 +190,10 @@ public class DownloadDeviceHelper {
for (int i = 0; i < dataSetBeanList.size(); i++) {
DataSetBean dataSetBean = dataSetBeanList.get(i);
Device device = WarehousBeanUtils.responseToDevice(dataSetBean);
device.setCustomerId(customerId);
if (deviceService.selectisSame(device.getDevicerecordkey(), device.getVersionnumber()) != null) {
return -1;
}
if (device.getBssjzt() != null && device.getBssjzt().equals("草稿")) {
// return -1;
} else if (device.getBssjzt() != null && device.getBssjzt().equals("草稿")) {
//草稿数据忽略
} else {
String uuid = getUUId();
@ -215,52 +212,63 @@ public class DownloadDeviceHelper {
keys.setDeviceRecordKey(device.getDevicerecordkey());
dataSetBeans.add(keys);
deviceHistoryRequest.setDataSet(dataSetBeans);
downloadHistory(deviceHistoryRequest, deviceService);
downloadHistory(customerId,deviceHistoryRequest, deviceService);
}
deviceService.insertDevice(device);
List<DataSetBean.DeviceClinicalBean> deviceclinicals = dataSetBean.getDeviceClinical();
List<Deviceclinical> deviceclinicalList = new ArrayList<>();
for (DataSetBean.DeviceClinicalBean deviceClinicalBean : deviceclinicals) {
if (deviceClinicalBean != null) {
Deviceclinical deviceclinical = WarehousBeanUtils.responseToDeviceclinical(deviceClinicalBean);
deviceclinical.setDevicerecordkey(device.getDevicerecordkey());
deviceclinical.setUuid(uuid);
deviceclinicalList.add(deviceclinical);
if (deviceclinicals != null && deviceclinicals.size() > 0) {
List<Deviceclinical> deviceclinicalList = new ArrayList<>();
for (DataSetBean.DeviceClinicalBean deviceClinicalBean : deviceclinicals) {
if (deviceClinicalBean != null) {
Deviceclinical deviceclinical = WarehousBeanUtils.responseToDeviceclinical(deviceClinicalBean);
deviceclinical.setDevicerecordkey(device.getDevicerecordkey());
deviceclinical.setUuid(uuid);
deviceclinicalList.add(deviceclinical);
}
}
deviceService.insertDeviceClinical(deviceclinicalList);
}
deviceService.insertDeviceClinical(deviceclinicalList);
List<DataSetBean.DevicePackageBean> devicePackageBeans = dataSetBean.getDevicePackage();
List<Devicepackage> devicepackageList = new ArrayList<>();
for (DataSetBean.DevicePackageBean devicePackageBean : devicePackageBeans) {
Devicepackage devicepackage = WarehousBeanUtils.responseToDevicepackage(devicePackageBean);
devicepackage.setDevicerecordkey(device.getDevicerecordkey());
devicepackage.setUuid(uuid);
devicepackageList.add(devicepackage);
if (devicePackageBeans != null && devicePackageBeans.size() > 0) {
List<Devicepackage> devicepackageList = new ArrayList<>();
for (DataSetBean.DevicePackageBean devicePackageBean : devicePackageBeans) {
Devicepackage devicepackage = WarehousBeanUtils.responseToDevicepackage(devicePackageBean);
devicepackage.setDevicerecordkey(device.getDevicerecordkey());
devicepackage.setUuid(uuid);
devicepackageList.add(devicepackage);
}
deviceService.insertDevicepackage(devicepackageList);
}
deviceService.insertDevicepackage(devicepackageList);
List<DataSetBean.DeviceStorageBean> deviceStorageBeans = dataSetBean.getDeviceStorage();
List<Devicestorage> devicestorageList = new ArrayList<>();
for (DataSetBean.DeviceStorageBean deviceStorageBean : deviceStorageBeans) {
Devicestorage devicestorage = WarehousBeanUtils.responseToDevicestorage(deviceStorageBean);
devicestorage.setDevicerecordkey(device.getDevicerecordkey());
devicestorage.setUuid(uuid);
devicestorageList.add(devicestorage);
if (deviceStorageBeans != null && deviceStorageBeans.size() > 0) {
List<Devicestorage> devicestorageList = new ArrayList<>();
for (DataSetBean.DeviceStorageBean deviceStorageBean : deviceStorageBeans) {
Devicestorage devicestorage = WarehousBeanUtils.responseToDevicestorage(deviceStorageBean);
devicestorage.setDevicerecordkey(device.getDevicerecordkey());
devicestorage.setUuid(uuid);
devicestorageList.add(devicestorage);
}
deviceService.insertDevicestorage(devicestorageList);
}
deviceService.insertDevicestorage(devicestorageList);
List<DataSetBean.ContactListBean> contactListBeans = dataSetBean.getContactList();
List<Contactlist> contactlistList = new ArrayList<>();
for (DataSetBean.ContactListBean contactListBean : contactListBeans) {
Contactlist contactlist = WarehousBeanUtils.responseToContactlist(contactListBean);
contactlist.setDevicerecordkey(device.getDevicerecordkey());
contactlist.setUuid(uuid);
contactlistList.add(contactlist);
if (contactListBeans != null && contactListBeans.size() > 0) {
List<Contactlist> contactlistList = new ArrayList<>();
for (DataSetBean.ContactListBean contactListBean : contactListBeans) {
Contactlist contactlist = WarehousBeanUtils.responseToContactlist(contactListBean);
contactlist.setDevicerecordkey(device.getDevicerecordkey());
contactlist.setUuid(uuid);
contactlistList.add(contactlist);
}
deviceService.insertContactlist(contactlistList);
}
deviceService.insertContactlist(contactlistList);
}
}
@ -272,7 +280,7 @@ public class DownloadDeviceHelper {
}
//下载历史记录
public int downloadHistory(DownloadHistoryRequest deviceHistoryRequest, DeviceService deviceService) {
public int downloadHistory(String customerId,DownloadHistoryRequest deviceHistoryRequest, DeviceService deviceService) {
String response = HttpClient.post("sharing/history/get", deviceHistoryRequest);
MedicalHistoryResonse medicalResonse = (MedicalHistoryResonse) JSONObject.parseObject(response, MedicalHistoryResonse.class);
if (medicalResonse.getReturnCode() == 1) {
@ -283,6 +291,7 @@ public class DownloadDeviceHelper {
Device device = WarehousBeanUtils.responseToDevice(dataSetBean);
String uuid = getUUId();
device.setUuid(uuid);
device.setCustomerId(customerId);
deviceService.insertDevice(device);
List<DataSetBean.DeviceClinicalBean> deviceclinicals = dataSetBean.getDeviceClinical();
@ -336,7 +345,7 @@ public class DownloadDeviceHelper {
}
//单挑下载
public int downloadBydi(DownloadDiRequest downloadDiRequest, DeviceService deviceService) {
public int downloadBydi(String customerId,DownloadDiRequest downloadDiRequest, DeviceService deviceService) {
String response = HttpClient.post("sharing/single", downloadDiRequest);
MedicalSingleResponse medicalResonse = (MedicalSingleResponse) JSONObject.parseObject(response, MedicalSingleResponse.class);
if (medicalResonse.getReturnCode() == 1) {
@ -350,6 +359,7 @@ public class DownloadDeviceHelper {
if (deviceService.selectisSame(device.getDevicerecordkey(), device.getVersionnumber()) != null) {
return -1;
}
device.setCustomerId(customerId);
deviceService.insertDevice(device);
List<DataSetBean.DeviceClinicalBean> deviceclinicals = dataSetBean.getDeviceClinical();
List<Deviceclinical> deviceclinicalList = new ArrayList<>();

2
api-udims/src/main/java/com/glxp/udi/admin/controller/info/EnterpriseCertController.java
Unescape Escape View File

@ -98,7 +98,7 @@ public class EnterpriseCertController {
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
// filterEnterpriseCertRequest.setCustomerId(authAdmin.getCustomerId()+""); //暂时取消
filterEnterpriseCertRequest.setCustomerId(authAdmin.getCustomerId()+""); //暂时取消
List<EnterpriseCertEntity> enterpriseCertEntities = enterpriseCertService.filterEnterpriseCerts(filterEnterpriseCertRequest);
PageInfo<EnterpriseCertEntity> pageInfo = new PageInfo<>(enterpriseCertEntities);
PageSimpleResponse<EnterpriseCertEntity> pageSimpleResponse = new PageSimpleResponse<>();

18
api-udims/src/main/java/com/glxp/udi/admin/controller/info/FacidentcodeController.java
Unescape Escape View File

@ -78,12 +78,18 @@ public class FacidentcodeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = facidentcodeService.deleteFacidentcode(deleteFacidentcodeRequest);
identifierService.deleteIdentifierByFacidentcode(deleteFacidentcodeRequest.getId());
if (!b) {
return ResultVOUtils.error(500, "删除失败");
if(!identifierService.isUsed(deleteFacidentcodeRequest.getId())){
boolean b = facidentcodeService.deleteFacidentcode(deleteFacidentcodeRequest);
identifierService.deleteIdentifierByFacidentcode(deleteFacidentcodeRequest.getId());
if (!b) {
return ResultVOUtils.error(500, "删除失败");
}
return ResultVOUtils.success("删除成功");
}else {
return ResultVOUtils.error(500, "生成的产品项目码已被使用，不能删除");
}
return ResultVOUtils.success("删除成功");
}
@ -147,6 +153,8 @@ public class FacidentcodeController {
identifierEntities.add(identifierEntity);
}
boolean b = identifierService.insertIdentifierList(identifierEntities);
facidentcodeEntity.setIsGenerate(1);
facidentcodeService.modifyFacidentcode(facidentcodeEntity);
if (!b)
return ResultVOUtils.success("生成失败");
return ResultVOUtils.success("生成成功");

139
api-udims/src/main/java/com/glxp/udi/admin/controller/publish/PostIdentifyController.java
Unescape Escape View File

@ -47,6 +47,8 @@ public class PostIdentifyController {
UdiDeviceSrgService udiDeviceSrgService;
@Resource
UdiProductService udiProductService;
@Resource
UdiSubProductService udiSubProductService;
//草稿上传
@AuthRuleAnnotation("")
@ -64,21 +66,37 @@ public class PostIdentifyController {
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyEntity);
// CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
TokenEntity tokenEntity = downloadDeviceHelper.getToken();
PostIdentifyEntity postIdentifyEntity = buildPost(postIdentifyRequest, tokenEntity.getAccessToken());
PostSaveResponse postSaveResponse = downloadDeviceHelper.postIdentify(postIdentifyEntity);
if (postSaveResponse.getReturnCode() == 1) {
List<PostSuccessBean> successListBeans = postSaveResponse.getSuccessList();
for (PostSuccessBean successListBean : successListBeans) {
successListBean.setStatus("2");
udiDeviceIdService.postUpdate(successListBean);
PostIdentifyEntity postIdentifyEntity = buildPost(postIdentifyRequest, tokenEntity.getAccessToken(),companyEntity);
new Thread(() -> {
PostSaveResponse postSaveResponse = downloadDeviceHelper.postIdentify(postIdentifyEntity);
if (postSaveResponse.getReturnCode() == 1) {
List<PostSuccessBean> successListBeans = postSaveResponse.getSuccessList();
for (PostSuccessBean successListBean : successListBeans) {
successListBean.setStatus("2");
udiDeviceIdService.postUpdate(successListBean);
UdiDeviceIdEntity udiDeviceIdEntity = udiDeviceIdService.selectByPriId(successListBean.getZXXSDYCPBS());
//更新子类信息状态
UdiSubProductEntity udiSubProductEntity = new UdiSubProductEntity();
udiSubProductEntity.setUDI_SubProductOID(udiDeviceIdEntity.getUDI_SubProduct_FK());
udiSubProductEntity.setStatus("2");
udiSubProductService.modifyUdiSubProduct(udiSubProductEntity);
//更新企业产品状态
UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setUDI_ProductOID(udiDeviceIdEntity.getUDI_Product_FK());
udiProductEntity.setStatus("2");
udiProductService.modifyUdiProduct(udiProductEntity);
}
}
}
return ResultVOUtils.success("添加成功");
}).start();
return ResultVOUtils.success("提交草稿上传成功");
}
public PostIdentifyEntity buildPost(PostIdentifyRequest postIdentifyRequest, String token) {
public PostIdentifyEntity buildPost(PostIdentifyRequest postIdentifyRequest, String token,CompanyEntity companyEntity) {
PostIdentifyEntity postIdentifyEntity = new PostIdentifyEntity();
postIdentifyEntity.setAccessToken(token);
List<PostDataBean> dataSetBeans = new ArrayList<>();
@ -90,8 +108,13 @@ public class PostIdentifyController {
UdiDeviceIdResponse udiDeviceIdResponse = udiDeviceIdResponses.get(i);
PostDataBean dataSetBean = new PostDataBean();
UdiProductEntity udiProductEntity = udiProductService.selectById(udiDeviceIdResponse.getUDI_Product_FK());
dataSetBean.setUploadType("add");
if (udiProductEntity.getStatus() == "2")
dataSetBean.setUploadType("modify");
else {
dataSetBean.setUploadType("add");
}
dataSetBean.setCPMCTYMC(udiProductEntity.getProductName());
dataSetBean.setTYSHXYDM(companyEntity.getCreditNum());
dataSetBean.setDeviceRecordKey(udiDeviceIdResponse.getDeviceRecordKey());
dataSetBean.setZXXSDYCPBS(udiDeviceIdResponse.getPrimaryDeviceId());
dataSetBean.setZXXSDYZSYDYDSL(udiDeviceIdResponse.getPkgQuantity());
@ -132,7 +155,7 @@ public class PostIdentifyController {
dataSetBean.setYFLBM(udiDeviceIdResponse.getProductOldCode());
dataSetBean.setYLQXZCRBARMC(udiDeviceIdResponse.getCompanyName());
dataSetBean.setYLQXZCRBARYWMC(udiDeviceIdResponse.getCompanyGBName());
dataSetBean.setTYSHXYDM(udiDeviceIdResponse.getBusinessLicense());
// dataSetBean.setTYSHXYDM(udiDeviceIdResponse.getBusinessLicense());
dataSetBean.setZCZBHHZBAPZBH(udiDeviceIdResponse.getRegcardCodes());
if (udiDeviceIdResponse.getProductType() != null && udiDeviceIdResponse.getProductType().equals("耗材"))
dataSetBean.setHCHZSB("0");
@ -144,7 +167,10 @@ public class PostIdentifyController {
if (udiDeviceIdResponse.getIsDeviceSterile() != null && udiDeviceIdResponse.getIsDeviceSterile().equals("1"))
dataSetBean.setSFWWJBZ("1");
else dataSetBean.setSFWWJBZ("0");
dataSetBean.setSYQSFXYJXMJ(udiDeviceIdResponse.getIsSterilizationUse());
if (udiDeviceIdResponse.getIsSterilizationUse() != null && udiDeviceIdResponse.getIsSterilizationUse().equals("1"))
dataSetBean.setSYQSFXYJXMJ("1");
else dataSetBean.setSYQSFXYJXMJ("0");
// dataSetBean.setSYQSFXYJXMJ(udiDeviceIdResponse.getIsSterilizationUse());
dataSetBean.setMJFS(udiDeviceIdResponse.getSterilizationMethod());
dataSetBean.setYBBM(udiDeviceIdResponse.getYBBM());
if (udiDeviceIdResponse.getMRISafetyInfo() == null)
@ -230,6 +256,70 @@ public class PostIdentifyController {
TokenEntity tokenEntity = downloadDeviceHelper.getToken();
List<UdiDeviceIdResponse> udiDeviceIdResponses = udiDeviceIdService.selectKeysByIds(postIdentifyRequest.getIds());
if (udiDeviceIdResponses != null && udiDeviceIdResponses.size() > 0) {
PostIdentifyKeyRequest postIdentifyKeyRequest = new PostIdentifyKeyRequest();
List<PostIdentifyKeyRequest.DataSetBean> dataSetBeans = new ArrayList<>();
for (UdiDeviceIdResponse udiDeviceIdResponse : udiDeviceIdResponses) {
PostIdentifyKeyRequest.DataSetBean dataSetBean = new PostIdentifyKeyRequest.DataSetBean();
if (udiDeviceIdResponse.getDeviceRecordKey() == null) {
return ResultVOUtils.error(500, "提交的标识包含未上传草稿，不能提交");
} else
dataSetBean.setDeviceRecordKey(udiDeviceIdResponse.getDeviceRecordKey());
dataSetBean.setZXXSDYCPBS(udiDeviceIdResponse.getPrimaryDeviceId());
dataSetBeans.add(dataSetBean);
}
postIdentifyKeyRequest.setDataSet(dataSetBeans);
postIdentifyKeyRequest.setAccessToken(tokenEntity.getAccessToken());
PostSaveResponse postSaveResponse = downloadDeviceHelper.postIdentifyKey(postIdentifyKeyRequest);
if (postSaveResponse.getReturnCode() == 1) {
List<PostSuccessBean> successListBeans = postSaveResponse.getSuccessList();
for (PostSuccessBean successListBean : successListBeans) {
successListBean.setStatus("3");
udiDeviceIdService.postUpdate(successListBean);
UdiDeviceIdEntity udiDeviceIdEntity = udiDeviceIdService.selectByPriId(successListBean.getZXXSDYCPBS());
//更新子类信息状态
UdiSubProductEntity udiSubProductEntity = new UdiSubProductEntity();
udiSubProductEntity.setUDI_SubProductOID(udiDeviceIdEntity.getUDI_SubProduct_FK());
udiSubProductEntity.setStatus("3");
udiSubProductService.modifyUdiSubProduct(udiSubProductEntity);
//更新企业产品状态
UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setUDI_ProductOID(udiDeviceIdEntity.getUDI_Product_FK());
udiProductEntity.setStatus("3");
udiProductService.modifyUdiProduct(udiProductEntity);
}
} else
return ResultVOUtils.error(500, "提交失败");
} else {
return ResultVOUtils.error(500, "上传数据为空");
}
return ResultVOUtils.success("添加成功");
}
//提交标识
@AuthRuleAnnotation("")
@PostMapping("/udims/postIdentify/uploadNow")
public BaseResponse postUploadNow(@RequestBody @Valid PostIdentifyRequest postIdentifyRequest, BindingResult bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyEntity);
TokenEntity tokenEntity = downloadDeviceHelper.getToken();
List<UdiDeviceIdResponse> udiDeviceIdResponses = udiDeviceIdService.selectKeysByIds(postIdentifyRequest.getIds());
if (udiDeviceIdResponses != null && udiDeviceIdResponses.size() > 0) {
PostIdentifyKeyRequest postIdentifyKeyRequest = new PostIdentifyKeyRequest();
List<PostIdentifyKeyRequest.DataSetBean> dataSetBeans = new ArrayList<>();
@ -246,13 +336,24 @@ public class PostIdentifyController {
if (postSaveResponse.getReturnCode() == 1) {
List<PostSuccessBean> successListBeans = postSaveResponse.getSuccessList();
for (PostSuccessBean successListBean : successListBeans) {
successListBean.setStatus("2");
successListBean.setStatus("3");
udiDeviceIdService.postUpdate(successListBean);
UdiDeviceIdEntity udiDeviceIdEntity = udiDeviceIdService.selectByPriId(successListBean.getZXXSDYCPBS());
//更新子类信息状态
UdiSubProductEntity udiSubProductEntity = new UdiSubProductEntity();
udiSubProductEntity.setUDI_SubProductOID(udiDeviceIdEntity.getUDI_SubProduct_FK());
udiSubProductEntity.setStatus("3");
udiSubProductService.modifyUdiSubProduct(udiSubProductEntity);
//更新企业产品状态
UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setUDI_ProductOID(udiDeviceIdEntity.getUDI_Product_FK());
udiProductEntity.setStatus("3");
udiProductService.modifyUdiProduct(udiProductEntity);
}
}else
return ResultVOUtils.error(500,"提交失败");
}else {
return ResultVOUtils.error(500,"上传数据为空");
} else
return ResultVOUtils.error(500, "提交失败");
} else {
return ResultVOUtils.error(500, "上传数据为空");
}
return ResultVOUtils.success("添加成功");
}

10
api-udims/src/main/java/com/glxp/udi/admin/controller/publish/ProductClassifyController.java
Unescape Escape View File

@ -37,21 +37,21 @@ public class ProductClassifyController {
for (int i = 0; i < levelList1.size(); i++) {
ProductClassifyEntity productClassifyEntity = levelList1.get(i);
ProductClassifyResponse productClassifyResponse = new ProductClassifyResponse();
productClassifyResponse.setLabel(productClassifyEntity.getName());
productClassifyResponse.setLabel("("+productClassifyEntity.getId()+")"+productClassifyEntity.getName());
productClassifyResponse.setValue(productClassifyEntity.getId());
List<ProductClassifyResponse> l2productClassifyResponses = new ArrayList<>();
for (int j = 0; j < levelList2.size(); j++) {
ProductClassifyEntity leve2Pce = levelList2.get(j);
if (leve2Pce.getProductClassify_FK().equals(productClassifyEntity.getProductClassifyOID())) {
ProductClassifyResponse lv2Res = new ProductClassifyResponse();
lv2Res.setLabel(leve2Pce.getName());
lv2Res.setLabel("("+leve2Pce.getId()+")"+leve2Pce.getName());
lv2Res.setValue(leve2Pce.getId());
List<ProductClassifyResponse> l3productClassifyResponses = new ArrayList<>();
for (int k = 0; k < levelList3.size(); k++) {
ProductClassifyEntity leve3Pce = levelList3.get(k);
if (leve3Pce.getProductClassify_FK().equals(leve2Pce.getProductClassifyOID())) {
ProductClassifyResponse lv3Res = new ProductClassifyResponse();
lv3Res.setLabel(leve3Pce.getName());
lv3Res.setLabel("("+leve3Pce.getId()+")"+leve3Pce.getName());
lv3Res.setValue(leve3Pce.getId());
l3productClassifyResponses.add(lv3Res);
}
@ -69,14 +69,14 @@ public class ProductClassifyController {
for (int i = 0; i < levelList1.size(); i++) {
ProductClassifyEntity productClassifyEntity = levelList1.get(i);
ProductClassifyResponse productClassifyResponse = new ProductClassifyResponse();
productClassifyResponse.setLabel(productClassifyEntity.getName());
productClassifyResponse.setLabel("("+productClassifyEntity.getId()+")"+productClassifyEntity.getName());
productClassifyResponse.setValue(productClassifyEntity.getId());
List<ProductClassifyResponse> l2productClassifyResponses = new ArrayList<>();
for (int j = 0; j < levelList2.size(); j++) {
ProductClassifyEntity leve2Pce = levelList2.get(j);
if (leve2Pce.getProductClassify_FK().equals(productClassifyEntity.getProductClassifyOID())) {
ProductClassifyResponse lv2Res = new ProductClassifyResponse();
lv2Res.setLabel(leve2Pce.getName());
lv2Res.setLabel("("+leve2Pce.getId()+")"+leve2Pce.getName());
lv2Res.setValue(leve2Pce.getId());
l2productClassifyResponses.add(lv2Res);
}

36
api-udims/src/main/java/com/glxp/udi/admin/controller/publish/SubUdiProductController.java
Unescape Escape View File

@ -2,14 +2,17 @@ package com.glxp.udi.admin.controller.publish;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.entity.info.IdentifierEntity;
import com.glxp.udi.admin.entity.publish.UdiDeviceCliEntity;
import com.glxp.udi.admin.entity.publish.UdiDeviceSrgEntity;
import com.glxp.udi.admin.entity.publish.UdiSubProductEntity;
import com.glxp.udi.admin.req.publish.*;
import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.service.info.IdentifierService;
import com.glxp.udi.admin.service.publish.UdiDeviceCliService;
import com.glxp.udi.admin.service.publish.UdiDeviceSrgService;
import com.glxp.udi.admin.service.publish.UdiSubProductService;
import com.glxp.udi.admin.util.DateUtil;
import com.glxp.udi.admin.util.UuidUtils;
import com.glxp.udi.common.enums.ResultEnum;
import com.glxp.udi.common.res.BaseResponse;
@ -34,6 +37,8 @@ public class SubUdiProductController {
private UdiDeviceCliService udiDeviceCliService;
@Resource
private UdiDeviceSrgService udiDeviceSrgService;
@Resource
private IdentifierService identifierService;
@AuthRuleAnnotation("")
@PostMapping("/udims/subProduct/add")
@ -47,9 +52,17 @@ public class SubUdiProductController {
String productId = UuidUtils.getUUId();
if (udiSubProductEntity != null) {
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() ==13) {
if (identifierService.isUsedIdentifyCode(udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1))) {
return ResultVOUtils.error(500, "商品条码已被使用");
}
}
udiSubProductEntity.setSYS_Created(DateUtil.getDateTime());
udiSubProductEntity.setUDI_SubProductOID(productId);
udiSubProductEntity.setStatus("1");
udiSubProductService.insertUdiSubProduct(udiSubProductEntity);
} else return ResultVOUtils.success("添加失败");
} else return ResultVOUtils.error(500,"添加失败");
List<UdiDeviceCliEntity> udiDeviceCliEntities = addSubProductRequest.getUdiDeviceCliEntities();
List<UdiDeviceCliEntity> insertClis = new ArrayList<>();
@ -71,7 +84,12 @@ public class SubUdiProductController {
}
udiDeviceSrgService.insertUdiDeviceSrgList(insertSrgs);
}
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13) {
String ideCode = udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, "1", ideCode, null));
}
return ResultVOUtils.success("添加成功");
}
@ -84,9 +102,16 @@ public class SubUdiProductController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UdiSubProductEntity udiSubProductEntity = addSubProductRequest.getUdiSubProductEntity();
UdiSubProductEntity temp = udiSubProductService.selectById(udiSubProductEntity.getUDI_SubProductOID());
if (udiSubProductEntity != null) {
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() ==13 && !temp.getSPTM().equals(udiSubProductEntity.getSPTM())) {
if (identifierService.isUsedIdentifyCode(udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1))) {
return ResultVOUtils.error(500, "商品条码已被使用");
}
}
udiSubProductService.modifyUdiSubProduct(udiSubProductEntity);
} else return ResultVOUtils.success("修改失败");
List<UdiDeviceCliEntity> udiDeviceCliEntities = addSubProductRequest.getUdiDeviceCliEntities();
@ -127,6 +152,12 @@ public class SubUdiProductController {
}
udiDeviceSrgService.insertUdiDeviceSrgList(insertSrgs);
}
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13) {
String ideCode = udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, "1", ideCode, null));
}
return ResultVOUtils.success("修改成功");
}
@ -155,7 +186,6 @@ public class SubUdiProductController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<UdiSubProductEntity> udiProductEntities = udiSubProductService.filterAll(filterUdiSubProductRequest);
PageInfo<UdiSubProductEntity> pageInfo = new PageInfo<>(udiProductEntities);
PageSimpleResponse<UdiSubProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());

93
api-udims/src/main/java/com/glxp/udi/admin/controller/publish/UdiDeviceIdController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.udi.admin.controller.publish;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.entity.auth.AuthAdmin;
import com.glxp.udi.admin.entity.info.IdentifierEntity;
import com.glxp.udi.admin.entity.publish.UdiDeviceIdEntity;
import com.glxp.udi.admin.entity.publish.UdiDevicepkEntity;
import com.glxp.udi.admin.exception.JsonException;
@ -10,6 +11,7 @@ import com.glxp.udi.admin.req.publish.*;
import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.res.publish.UdiDeviceIdResponse;
import com.glxp.udi.admin.service.auth.AuthAdminService;
import com.glxp.udi.admin.service.info.IdentifierService;
import com.glxp.udi.admin.service.publish.UdiDeviceIdService;
import com.glxp.udi.admin.service.publish.UdiDevicepkService;
import com.glxp.udi.admin.service.publish.UdiSubProductService;
@ -45,6 +47,9 @@ public class UdiDeviceIdController {
@Resource
AuthAdminService authAdminService;
@Resource
private IdentifierService identifierService;
@AuthRuleAnnotation("")
@PostMapping("/udims/deviceId/add")
public BaseResponse add(@RequestBody @Valid AddUdiDeviceIdRequest addUdiDeviceIdRequest, BindingResult bindingResult) {
@ -53,14 +58,42 @@ public class UdiDeviceIdController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UdiDeviceIdEntity udiDeviceIdEntity = addUdiDeviceIdRequest.getUdiDeviceIdEntity();
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
String productId = UuidUtils.getUUId();
if (udiDeviceIdEntity != null) {
if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 10) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getPrimaryDeviceId().
substring(1, udiDeviceIdEntity.getPrimaryDeviceId().length() - 1))) {
return ResultVOUtils.error(500, "最小销售单元产品标识条码已被使用");
}
}
if (udiDeviceIdEntity.getDirectMarkDI() != null && udiDeviceIdEntity.getDirectMarkDI().length() > 10) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getDirectMarkDI().
substring(1, udiDeviceIdEntity.getDirectMarkDI().length() - 1))) {
return ResultVOUtils.error(500, "本体产品标识条码已被使用");
}
}
if (udiDeviceIdEntity.getUseUnitDeviceId() != null && udiDeviceIdEntity.getUseUnitDeviceId().length() > 10) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getUseUnitDeviceId().
substring(1, udiDeviceIdEntity.getUseUnitDeviceId().length() - 1))) {
return ResultVOUtils.error(500, "使用单元产品标识条码已被使用");
}
}
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) {
if (identifierService.isUsedIdentifyCode(udiDevicepkEntity.getPkgDeviceId().
substring(1, udiDevicepkEntity.getPkgDeviceId().length() - 1))) {
return ResultVOUtils.error(500, "包装产品标识条码已被使用");
}
}
}
udiDeviceIdEntity.setUDI_DeviceIdOID(productId);
udiDeviceIdEntity.setStatus("1");
udiDeviceIdService.insertUdiDeviceId(udiDeviceIdEntity);
} else return ResultVOUtils.success("添加失败");
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
List<UdiDevicepkEntity> insertPkgs = new ArrayList<>();
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
@ -70,11 +103,38 @@ public class UdiDeviceIdController {
insertPkgs.add(udiDevicepkEntity);
}
udiDevicepkService.insertUdiDevicepkList(insertPkgs);
updateIdentifyStatus(udiDeviceIdEntity,udiDevicepkEntities);
}
return ResultVOUtils.success("添加成功");
}
public void updateIdentifyStatus(UdiDeviceIdEntity udiDeviceIdEntity, List<UdiDevicepkEntity> udiDevicepkEntities) {
if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 10) {
String ideCode = udiDeviceIdEntity.getPrimaryDeviceId().
substring(1, udiDeviceIdEntity.getPrimaryDeviceId().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "1"));
}
if (udiDeviceIdEntity.getDirectMarkDI() != null && udiDeviceIdEntity.getDirectMarkDI().length() > 10) {
String ideCode = udiDeviceIdEntity.getDirectMarkDI().
substring(1, udiDeviceIdEntity.getDirectMarkDI().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "1"));
}
if (udiDeviceIdEntity.getUseUnitDeviceId() != null && udiDeviceIdEntity.getUseUnitDeviceId().length() > 10) {
String ideCode = udiDeviceIdEntity.getUseUnitDeviceId().
substring(1, udiDeviceIdEntity.getUseUnitDeviceId().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "1"));
}
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) {
String ideCode = udiDevicepkEntity.getPkgDeviceId().
substring(1, udiDevicepkEntity.getPkgDeviceId().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "1"));
}
}
}
@AuthRuleAnnotation("")
@PostMapping("/udims/deviceId/delete")
public BaseResponse deleteDeviceId(@RequestBody @Valid DeleteUdiDeviceIdRequest deleteUdiProductRequest, BindingResult bindingResult) {
@ -101,12 +161,33 @@ public class UdiDeviceIdController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UdiDeviceIdEntity udiDeviceIdEntity = addUdiDeviceIdRequest.getUdiDeviceIdEntity();
UdiDeviceIdEntity temp = udiDeviceIdService.selectById(udiDeviceIdEntity.getUDI_DeviceIdOID());
if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getPrimaryDeviceId().
substring(1, udiDeviceIdEntity.getPrimaryDeviceId().length() - 1))) {
return ResultVOUtils.error(500, "最小销售单元产品标识条码已被使用");
}
}
if (udiDeviceIdEntity.getDirectMarkDI() != null && udiDeviceIdEntity.getDirectMarkDI().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getDirectMarkDI().
substring(1, udiDeviceIdEntity.getDirectMarkDI().length() - 1))) {
return ResultVOUtils.error(500, "本体产品标识条码已被使用");
}
}
if (udiDeviceIdEntity.getUseUnitDeviceId() != null && udiDeviceIdEntity.getUseUnitDeviceId().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getUseUnitDeviceId().
substring(1, udiDeviceIdEntity.getUseUnitDeviceId().length() - 1))) {
return ResultVOUtils.error(500, "使用单元产品标识条码已被使用");
}
}
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
if (udiDeviceIdEntity != null) {
udiDeviceIdService.modifyUdiDeviceId(udiDeviceIdEntity);
} else return ResultVOUtils.success("修改失败");
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
} else return ResultVOUtils.error(500, "修改失败");
List<UdiDevicepkEntity> insertPkgs = new ArrayList<>();
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
@ -125,10 +206,12 @@ public class UdiDeviceIdController {
}
udiDevicepkService.insertUdiDevicepkList(insertPkgs);
}
updateIdentifyStatus(udiDeviceIdEntity,udiDevicepkEntities);
return ResultVOUtils.success("修改成功");
}
@AuthRuleAnnotation("")
@GetMapping("/udims/deviceId/list")
public BaseResponse listDeviceId(@Valid FilterDeviceIdRequest filterDeviceIdRequest, BindingResult bindingResult) {
@ -143,7 +226,7 @@ public class UdiDeviceIdController {
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
filterDeviceIdRequest.setCustomerId(authAdmin.getCustomerId()+"");
filterDeviceIdRequest.setCustomerId(authAdmin.getCustomerId() + "");
List<UdiDeviceIdResponse> udiDeviceIdEntities = udiDeviceIdService.selectByProductId(filterDeviceIdRequest);
PageInfo<UdiDeviceIdResponse> pageInfo = new PageInfo<>(udiDeviceIdEntities);

22
api-udims/src/main/java/com/glxp/udi/admin/controller/publish/UdiProductController.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.res.publish.UdiProductResponse;
import com.glxp.udi.admin.service.auth.AuthAdminService;
import com.glxp.udi.admin.service.publish.UdiProductService;
import com.glxp.udi.admin.service.publish.UdiSubProductService;
import com.glxp.udi.admin.util.UuidUtils;
import com.glxp.udi.common.enums.ResultEnum;
import com.glxp.udi.common.res.BaseResponse;
@ -34,6 +35,8 @@ public class UdiProductController {
@Resource
private UdiProductService udiProductService;
@Resource
private UdiSubProductService udiSubProductService;
@Resource
private AuthAdminService authAdminService;
@AuthRuleAnnotation("")
@ -52,6 +55,7 @@ public class UdiProductController {
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
udiProductEntity.setUDI_Customer_FK(authAdmin.getCustomerId() + "");
udiProductEntity.setUDI_ProductOID(UuidUtils.getUUId());
udiProductEntity.setStatus("1");
boolean b = udiProductService.insertUdiProduct(udiProductEntity);
if (!b)
return ResultVOUtils.success("添加失败");
@ -62,19 +66,15 @@ public class UdiProductController {
@PostMapping("/udims/product/delete")
public BaseResponse deleteCustomerContrast(@RequestBody @Valid DeleteUdiProductRequest deleteUdiProductRequest, BindingResult bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
int count = udiSubProductService.selectCount(deleteUdiProductRequest.getId());
if (count > 0) {
return ResultVOUtils.error(500, "请先删除子类信息");
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
boolean b = udiProductService.deleteUdiProduct(deleteUdiProductRequest);
//删除关联数据
//toDo
if (!b) {
return ResultVOUtils.error(500, "删除失败");
@ -132,11 +132,11 @@ public class UdiProductController {
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
List<UdiProductEntity> udiProductEntities = udiProductService.selectByCustomerId(authAdmin.getCustomerId() );
List<UdiProductEntity> udiProductEntities = udiProductService.selectByCustomerId(authAdmin.getCustomerId());
List<UdiProductResponse> udiProductResponses = new ArrayList<>();
if(udiProductEntities!=null && udiProductEntities.size()>0){
for(UdiProductEntity udiProductEntity:udiProductEntities){
if (udiProductEntities != null && udiProductEntities.size() > 0) {
for (UdiProductEntity udiProductEntity : udiProductEntities) {
UdiProductResponse udiProductResponse = new UdiProductResponse();
udiProductResponse.setLabel(udiProductEntity.getProductName());
udiProductResponse.setValue(udiProductEntity.getUDI_ProductOID());

4
api-udims/src/main/java/com/glxp/udi/admin/dao/info/IdentifierDao.java
Unescape Escape View File

@ -25,4 +25,8 @@ public interface IdentifierDao {
String randomCode(FilterIdentifierRequest filterIdentifierRequest);
Integer isUsed(String facidentcode);
Integer isUsedIdentifyCode(String code);
boolean updateIsUsed(IdentifierEntity identifierEntity);
}

4
api-udims/src/main/java/com/glxp/udi/admin/dao/publish/UdiDeviceIdDao.java
Unescape Escape View File

@ -31,4 +31,8 @@ public interface UdiDeviceIdDao {
List<UdiDeviceIdResponse> selectKeysByIds(List<String> ids);
UdiDeviceIdEntity selectByPriId(String primaryDeviceId);
UdiDeviceIdEntity selectById(String UDI_DeviceIdOID);
}

2
api-udims/src/main/java/com/glxp/udi/admin/dao/publish/UdiSubProductDao.java
Unescape Escape View File

@ -21,5 +21,7 @@ public interface UdiSubProductDao {
List<UdiSubProductEntity> filterAll(FilterUdiSubProductRequest filterCodeContrastRequest);
Integer selectCount(String productId);
UdiSubProductEntity selectById(String UDI_SubProductOID);
}

3
api-udims/src/main/java/com/glxp/udi/admin/dao/udid/DeviceMapper.java
Unescape Escape View File

@ -44,6 +44,7 @@ public interface DeviceMapper {
boolean deleteHistory(@Param("deviceRecordKey") String deviceRecordKey);
Device searchByDeviceRecordKey(@Param("deviceRecordKey") String deviceRecordKey);
Device searchByZxxscpbs(@Param("zxxsdycpbs") String zxxsdycpbs);
List<Device> searchHistory(@Param("deviceRecordKey") String deviceRecordKey);
@ -51,4 +52,6 @@ public interface DeviceMapper {
String selectisSame(@Param("deviceRecordKey") String deviceRecordKey, @Param("versionNumber") String versionNumber);
String selectKey(@Param("zxxsdycpbs") String zxxsdycpbs);
List<String> selectDeviceRecordKey(@Param("customerId") String customerId);
}

2
api-udims/src/main/java/com/glxp/udi/admin/entity/auth/CustomerDetailEntity.java
Unescape Escape View File

@ -14,7 +14,7 @@ public class CustomerDetailEntity {
private Integer userFlag;
private int isInfoLink;
private String infoLink;
private int roleId;
private String roleId;
private int userMax;
private String contacts;
private String mobile;

1
api-udims/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java
Unescape Escape View File

@ -23,4 +23,5 @@ public class UserRegisterEntity {
private String checkTime;
private String comments;
private int checkCode;
private String areaCode;
}

1
api-udims/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java
Unescape Escape View File

@ -11,6 +11,7 @@ public class CompanyEntity {
private String classes; //企业类别 //企业类别：1.生产企业，2.流通企业，3。医疗机构
private String area;
private String areaCode;
private String detailAddr;
private String appId;
private String appSecret;

1
api-udims/src/main/java/com/glxp/udi/admin/entity/info/FacidentcodeEntity.java
Unescape Escape View File

@ -13,6 +13,7 @@ public class FacidentcodeEntity {
private String NoDigit; //序号位数
private String UDI_Customer_FK;
private String UDI_StandAgency_FK; //发码机构外键
private int isGenerate; //是否生成项目码 0:未生成，1：已生成
private String SYS_Created;

169
api-udims/src/main/java/com/glxp/udi/admin/entity/info/IdentifierEntity.java
Unescape Escape View File

@ -1,13 +1,19 @@
package com.glxp.udi.admin.entity.info;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
//生成项目码
@Data
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY,getterVisibility = JsonAutoDetect.Visibility.NONE)
public class IdentifierEntity {
public IdentifierEntity(){}
public IdentifierEntity(String isReg, String isSPTM, String identifierCode, String isUDI) {
IsReg = isReg;
this.isSPTM = isSPTM;
IdentifierCode = identifierCode;
IsUDI = isUDI;
}
private String GtinCode;
private String isGTIN;
private String IsReg;
@ -42,4 +48,163 @@ public class IdentifierEntity {
private String SYS_ORG;
private String SYS_LAST_UPD_BY;
public String getGtinCode() {
return GtinCode;
}
public void setGtinCode(String gtinCode) {
GtinCode = gtinCode;
}
public String getIsGTIN() {
return isGTIN;
}
public void setIsGTIN(String isGTIN) {
this.isGTIN = isGTIN;
}
public String getIsReg() {
return IsReg;
}
public void setIsReg(String isReg) {
IsReg = isReg;
}
public String getIsSPTM() {
return isSPTM;
}
public void setIsSPTM(String isSPTM) {
this.isSPTM = isSPTM;
}
public String getBZ() {
return BZ;
}
public void setBZ(String BZ) {
this.BZ = BZ;
}
public String getIdentifierCode() {
return IdentifierCode;
}
public void setIdentifierCode(String identifierCode) {
IdentifierCode = identifierCode;
}
public String getIsUDI() {
return IsUDI;
}
public void setIsUDI(String isUDI) {
IsUDI = isUDI;
}
public String getSeqNumber() {
return SeqNumber;
}
public void setSeqNumber(String seqNumber) {
SeqNumber = seqNumber;
}
public String getUDI_FacIdentCode_FK() {
return UDI_FacIdentCode_FK;
}
public void setUDI_FacIdentCode_FK(String UDI_FacIdentCode_FK) {
this.UDI_FacIdentCode_FK = UDI_FacIdentCode_FK;
}
public String getUDI_DeviceId_FK() {
return UDI_DeviceId_FK;
}
public void setUDI_DeviceId_FK(String UDI_DeviceId_FK) {
this.UDI_DeviceId_FK = UDI_DeviceId_FK;
}
public String getUDI_IdentifierOID() {
return UDI_IdentifierOID;
}
public void setUDI_IdentifierOID(String UDI_IdentifierOID) {
this.UDI_IdentifierOID = UDI_IdentifierOID;
}
public String getSYS_Created() {
return SYS_Created;
}
public void setSYS_Created(String SYS_Created) {
this.SYS_Created = SYS_Created;
}
public String getSYS_LAST_UPD() {
return SYS_LAST_UPD;
}
public void setSYS_LAST_UPD(String SYS_LAST_UPD) {
this.SYS_LAST_UPD = SYS_LAST_UPD;
}
public String getSYS_Deleted() {
return SYS_Deleted;
}
public void setSYS_Deleted(String SYS_Deleted) {
this.SYS_Deleted = SYS_Deleted;
}
public String getSYS_CreatedBy() {
return SYS_CreatedBy;
}
public void setSYS_CreatedBy(String SYS_CreatedBy) {
this.SYS_CreatedBy = SYS_CreatedBy;
}
public String getSYS_REPLACEMENT() {
return SYS_REPLACEMENT;
}
public void setSYS_REPLACEMENT(String SYS_REPLACEMENT) {
this.SYS_REPLACEMENT = SYS_REPLACEMENT;
}
public String getSYS_POSTN() {
return SYS_POSTN;
}
public void setSYS_POSTN(String SYS_POSTN) {
this.SYS_POSTN = SYS_POSTN;
}
public String getSYS_DIVISION() {
return SYS_DIVISION;
}
public void setSYS_DIVISION(String SYS_DIVISION) {
this.SYS_DIVISION = SYS_DIVISION;
}
public String getSYS_ORG() {
return SYS_ORG;
}
public void setSYS_ORG(String SYS_ORG) {
this.SYS_ORG = SYS_ORG;
}
public String getSYS_LAST_UPD_BY() {
return SYS_LAST_UPD_BY;
}
public void setSYS_LAST_UPD_BY(String SYS_LAST_UPD_BY) {
this.SYS_LAST_UPD_BY = SYS_LAST_UPD_BY;
}
}

2
api-udims/src/main/java/com/glxp/udi/admin/entity/publish/UdiDevicepkEntity.java
Unescape Escape View File

@ -27,4 +27,6 @@ public class UdiDevicepkEntity {
private int isDelete; //1:已删除
}

1
api-udims/src/main/java/com/glxp/udi/admin/entity/publish/UdiProductEntity.java
Unescape Escape View File

@ -16,6 +16,7 @@ public class UdiProductEntity {
private String UDI_Customer_FK;
private String SYS_Created;
private String SYS_LAST_UPD;
private String status;
//未用
private String SYS_Deleted;

1
api-udims/src/main/java/com/glxp/udi/admin/entity/publish/UdiSubProductEntity.java
Unescape Escape View File

@ -43,6 +43,7 @@ public class UdiSubProductEntity {
private String UDI_Registration_FK;
private String UDI_Enterprise_FK;
private String UDI_SubProduct_FK;
private String status;
private String SYS_Created;
private String SYS_LAST_UPD;

9
api-udims/src/main/java/com/glxp/udi/admin/entity/udid/Device.java
Unescape Escape View File

@ -94,6 +94,7 @@ public class Device {
private String devicehistoryrecordkey;
private String bssjzt;
private String customerId;
public String getUuid() {
return uuid;
@ -470,4 +471,12 @@ public class Device {
public void setBssjzt(String bssjzt) {
this.bssjzt = bssjzt == null ? null : bssjzt.trim();
}
public String getCustomerId() {
return customerId;
}
public void setCustomerId(String customerId) {
this.customerId = customerId;
}
}

1
api-udims/src/main/java/com/glxp/udi/admin/entity/udid/DeviceEntity.java
Unescape Escape View File

@ -145,6 +145,7 @@ public class DeviceEntity {
private String devicehistoryrecordkey;
private String bssjzt;
private String customerId;
private boolean check;
private List<Contactlist> contactlistList;

5
api-udims/src/main/java/com/glxp/udi/admin/req/info/FilterIdentifierRequest.java
Unescape Escape View File

@ -1,14 +1,19 @@
package com.glxp.udi.admin.req.info;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
@Data
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY,getterVisibility = JsonAutoDetect.Visibility.NONE)
public class FilterIdentifierRequest {
private String IdentifierCode;
private String IsUDI;
private String isSPTM;
private String IsReg;
private Integer page;
private Integer limit;
private String facidentcode;
}

3
api-udims/src/main/java/com/glxp/udi/admin/req/publish/DeleteUdiSubProductRequest.java
Unescape Escape View File

@ -1,5 +1,8 @@
package com.glxp.udi.admin.req.publish;
import lombok.Data;
@Data
public class DeleteUdiSubProductRequest {
private String id;

1
api-udims/src/main/java/com/glxp/udi/admin/req/publish/FilterUdiSubProductRequest.java
Unescape Escape View File

@ -8,5 +8,6 @@ public class FilterUdiSubProductRequest extends ListPageRequest {
private String specification;
private String productId;
private String status;
}

1
api-udims/src/main/java/com/glxp/udi/admin/req/udid/DeviceListRequest.java
Unescape Escape View File

@ -7,5 +7,6 @@ import lombok.Data;
@Data
public class DeviceListRequest extends ListPageRequest {
private String key;
private String customerId; //and customerId = #{customerId}
}

1
api-udims/src/main/java/com/glxp/udi/admin/req/udid/DeviceSearchRequest.java
Unescape Escape View File

@ -11,5 +11,6 @@ public class DeviceSearchRequest extends ListPageRequest {
private String ylqxzcrbarmc;
private String ggxh;
private String zczbhhzbapzbh;
private String customerId;
}

2
api-udims/src/main/java/com/glxp/udi/admin/res/basic/FacidentcodeResponse.java
Unescape Escape View File

@ -13,5 +13,7 @@ public class FacidentcodeResponse {
private String IndentCode; //厂商识别码
private String Text1; //备注
private String NoDigit; //序号位数
private int isGenerate;
private String UDI_StandAgency_FK;
}

2
api-udims/src/main/java/com/glxp/udi/admin/res/udid/MedicalHistoryResonse.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.glxp.udi.admin.res.udid;
import java.util.List;
//生产企业
public class MedicalHistoryResonse {

14
api-udims/src/main/java/com/glxp/udi/admin/service/auth/impl/CustomerInfoServiceImpl.java
Unescape Escape View File

@ -54,15 +54,11 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
CustomerDetailEntity customerDetailEntity = customerDetailEntities.get(i);
int count = authAdminDao.findCountByCustomerId(customerDetailEntity.getCustomerId());
customerDetailEntities.get(i).setCount(count + "");
AuthRole authRole = authRoleService.findById(Long.parseLong(customerDetailEntity.getRoleId() + ""));
if (authRole != null)
customerDetailEntities.get(i).setRole(authRole.getName());
// if (customerDetailEntity.getRoleId() != null) {
// List<Long> roleId = JSON.parseArray(customerDetailEntity.getRoleId(), Long.class);
// AuthRole authRole = authRoleService.findById(roleId.get(0));
// customerDetailEntities.get(i).setRole(authRole.getName());
// }
if(!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId()!=null ){
AuthRole authRole = authRoleService.findById(Long.parseLong(customerDetailEntity.getRoleId() + ""));
if (authRole != null)
customerDetailEntities.get(i).setRole(authRole.getName());
}
}
return customerDetailEntities;

6
api-udims/src/main/java/com/glxp/udi/admin/service/info/IdentifierService.java
Unescape Escape View File

@ -22,4 +22,10 @@ public interface IdentifierService {
List<IdentifierEntity> selectByfacident(FilterIdentifierRequest filterIdentifierRequest);
String randomCode(FilterIdentifierRequest filterIdentifierRequest);
boolean isUsed(String facidentcode);
boolean isUsedIdentifyCode(String code);
boolean updateIsUsed(IdentifierEntity identifierEntity);
}

21
api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/IdentifierServiceImpl.java
Unescape Escape View File

@ -58,4 +58,25 @@ public class IdentifierServiceImpl implements IdentifierService {
public String randomCode(FilterIdentifierRequest filterIdentifierRequest) {
return identifierDao.randomCode(filterIdentifierRequest);
}
@Override
public boolean isUsed(String facidentcode) {
if (identifierDao.isUsed(facidentcode) == 0) {
return false;
}
return true;
}
@Override
public boolean isUsedIdentifyCode(String code) {
if (identifierDao.isUsedIdentifyCode(code) == 0) {
return false;
}
return true;
}
@Override
public boolean updateIsUsed(IdentifierEntity identifierEntity) {
return identifierDao.updateIsUsed(identifierEntity);
}
}

4
api-udims/src/main/java/com/glxp/udi/admin/service/publish/UdiDeviceIdService.java
Unescape Escape View File

@ -25,8 +25,12 @@ public interface UdiDeviceIdService {
boolean postUpdate(PostSuccessBean successListBean);
UdiDeviceIdEntity selectByPriId(String primaryDeviceId);
//关联查询上传
List<UdiDeviceIdResponse> selectByByIds(List<String> ids);
List<UdiDeviceIdResponse> selectKeysByIds(List<String> ids);
UdiDeviceIdEntity selectById(String UDI_DeviceIdOID);
}

3
api-udims/src/main/java/com/glxp/udi/admin/service/publish/UdiSubProductService.java
Unescape Escape View File

@ -18,4 +18,7 @@ public interface UdiSubProductService {
List<UdiSubProductEntity> filterAll(FilterUdiSubProductRequest filterCodeContrastRequest);
Integer selectCount(String productId);
UdiSubProductEntity selectById(String UDI_SubProductOID);
}

10
api-udims/src/main/java/com/glxp/udi/admin/service/publish/impl/UdiDeviceIdServiceImpl.java
Unescape Escape View File

@ -61,6 +61,11 @@ public class UdiDeviceIdServiceImpl implements UdiDeviceIdService {
return udiDeviceIdDao.postUpdate(successListBean);
}
@Override
public UdiDeviceIdEntity selectByPriId(String primaryDeviceId) {
return udiDeviceIdDao.selectByPriId(primaryDeviceId);
}
@Override
public List<UdiDeviceIdResponse> selectByByIds(List<String> ids) {
return udiDeviceIdDao.selectByByIds(ids);
@ -70,4 +75,9 @@ public class UdiDeviceIdServiceImpl implements UdiDeviceIdService {
public List<UdiDeviceIdResponse> selectKeysByIds(List<String> ids) {
return udiDeviceIdDao.selectKeysByIds(ids);
}
@Override
public UdiDeviceIdEntity selectById(String UDI_DeviceIdOID) {
return udiDeviceIdDao.selectById(UDI_DeviceIdOID);
}
}

12
api-udims/src/main/java/com/glxp/udi/admin/service/publish/impl/UdiSubProductServiceImpl.java
Unescape Escape View File

@ -45,7 +45,17 @@ public class UdiSubProductServiceImpl implements UdiSubProductService {
}
int offset = (filterCodeContrastRequest.getPage() - 1) * filterCodeContrastRequest.getLimit();
PageHelper.offsetPage(offset, filterCodeContrastRequest.getLimit());
List<UdiSubProductEntity> udiSubProductEntities= udiSubProductDao.filterAll(filterCodeContrastRequest);
List<UdiSubProductEntity> udiSubProductEntities = udiSubProductDao.filterAll(filterCodeContrastRequest);
return udiSubProductEntities;
}
@Override
public Integer selectCount(String productId) {
return udiSubProductDao.selectCount(productId);
}
@Override
public UdiSubProductEntity selectById(String UDI_SubProductOID) {
return udiSubProductDao.selectById(UDI_SubProductOID);
}
}

3
api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java
Unescape Escape View File

@ -13,7 +13,7 @@ import java.util.Map;
public class HttpClient {
public static String post(String url,Object object) {
System.out.println("参数:\n"+(String)object);
System.out.println("参数:\n"+object);
RestTemplate restTemplate = new RestTemplate();
String json = JSONObject.toJSON(object).toString();
MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
@ -22,7 +22,6 @@ public class HttpClient {
headers.add("Content-Type", "application/x-www-form-urlencoded");
HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(postParameters, headers);
System.out.println(UdidConfig.apiUrl+url);
String response = restTemplate.postForObject(UdidConfig.apiUrl+url, httpEntity,String.class);
System.out.println(response);

2
api-udims/src/main/resources/application-pro.properties
Unescape Escape View File

@ -2,7 +2,7 @@
server.port=9995
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udimsdb?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
server.servlet.context-path=

20
api-udims/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
Unescape Escape View File

@ -30,7 +30,7 @@
<select id="findByUserName" parameterType="hashmap" resultType="com.glxp.udi.admin.entity.auth.AuthAdmin">
SELECT *
FROM UDI_User
FROM udi_user
<where>
userName = #{userName}
</where>
@ -39,7 +39,7 @@
<select id="findById" parameterType="hashmap" resultType="com.glxp.udi.admin.entity.auth.AuthAdmin">
SELECT *
FROM UDI_User
FROM udi_user
<where>
id = #{id}
</where>
@ -48,7 +48,7 @@
<select id="findPwdById" parameterType="hashmap" resultType="com.glxp.udi.admin.entity.auth.AuthAdmin">
SELECT passWord
FROM UDI_User
FROM udi_user
<where>
id = #{id}
</where>
@ -56,7 +56,7 @@
</select>
<insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.udi.admin.entity.auth.AuthAdmin">
INSERT INTO UDI_User(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId)
INSERT INTO udi_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId)
values
(#{userName},
<choose>
@ -92,7 +92,7 @@
</insert>
<update id="updateAuthAdmin" parameterType="com.glxp.udi.admin.entity.auth.AuthAdmin">
UPDATE UDI_User
UPDATE udi_user
<set>
<if test="userName != null">userName=#{userName},</if>
<if test="passWord != null">passWord=#{passWord},</if>
@ -106,16 +106,16 @@
</update>
<delete id="deleteById" parameterType="java.lang.Long">
delete from UDI_User where id = #{id}
delete from udi_user where id = #{id}
</delete>
<delete id="deleteByCustomerId" parameterType="java.lang.Long">
delete from UDI_User where CustomerId = #{id}
delete from udi_user where CustomerId = #{id}
</delete>
<select id="findByCustomerId" parameterType="java.lang.Long" resultType="com.glxp.udi.admin.entity.auth.AuthAdmin">
SELECT *
FROM UDI_User
FROM udi_user
<where>
CustomerId = #{id}
</where>
@ -124,14 +124,14 @@
<select id="findCountByCustomerId" parameterType="java.lang.Long" resultType="java.lang.Integer">
SELECT count(0)
FROM UDI_User
FROM udi_user
where
CustomerId = #{id}
</select>
<update id="updateUserByCustomerId" parameterType="com.glxp.udi.admin.entity.auth.UpdateUserflagBean">
UPDATE UDI_User
UPDATE udi_user
<set>
<if test="userFlag != null">userFlag=#{userFlag},</if>

5
api-udims/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml
Unescape Escape View File

@ -28,7 +28,7 @@
tel, mobile, userId,
email, companyName, creditNum,
area, detailAddr, bussinessStatus,
checkType, registerTime, checkTime,comments
checkType, registerTime, checkTime,comments,areaCode
)
values
(
@ -37,7 +37,7 @@
#{email},#{companyName},#{creditNum},
#{area},#{detailAddr},#{bussinessStatus},
#{checkType},#{registerTime},#{checkTime},
#{comments}
#{comments},#{areaCode}
)
</insert>
@ -59,6 +59,7 @@
<if test="checkType != null">checkType=#{checkType},</if>
<if test="registerTime != null">registerTime=#{registerTime},</if>
<if test="checkTime != null">checkTime=#{checkTime},</if>
<if test="areaCode != null">areaCode=#{areaCode},</if>
</set>
WHERE id=#{id}
</update>

5
api-udims/src/main/resources/mybatis/mapper/info/CompanyDao.xml
Unescape Escape View File

@ -25,6 +25,7 @@
<if test="mobile != null">mobile=#{mobile},</if>
<if test="tel != null">tel=#{tel},</if>
<if test="email != null">email=#{email},</if>
<if test="areaCode != null">areaCode=#{areaCode},</if>
</set>
WHERE customerId=#{customerId}
@ -34,7 +35,7 @@
<insert id="insertCompany" parameterType="com.glxp.udi.admin.entity.info.CompanyEntity">
INSERT INTO company(companyName,
bussinessStatus,creditNum,classes,area,
detailAddr,appId,appSecret,contacts,mobile,tel,email,customerId) values
detailAddr,appId,appSecret,contacts,mobile,tel,email,customerId,areaCode) values
( #{companyName},
#{bussinessStatus},
#{creditNum},
@ -47,7 +48,7 @@
#{mobile},
#{tel},
#{email},
#{customerId})
#{customerId},#{areaCode})
</insert>

2
api-udims/src/main/resources/mybatis/mapper/info/EnterpriseCertDao.xml
Unescape Escape View File

@ -140,7 +140,7 @@
and ZCBACPBS like concat(#{ZCBACPBS},'%')
</if>
<if test="customerId != null and customerId != ''">
and customer_contrast.customerId = #{customerId}
and UDI_Enterprise_FK = #{customerId}
</if>
</where>

11
api-udims/src/main/resources/mybatis/mapper/info/FacidentcodeDao.xml
Unescape Escape View File

@ -55,17 +55,18 @@
<if test="NoDigit != null">NoDigit=#{NoDigit},</if>
<if test="UDI_Customer_FK != null">UDI_Customer_FK=#{UDI_Customer_FK},</if>
<if test="UDI_StandAgency_FK != null">UDI_StandAgency_FK=#{UDI_StandAgency_FK},</if>
<if test="isGenerate != null">isGenerate=#{isGenerate},</if>
</set>
WHERE UDI_FacIdentCodeOID=#{UDI_FacIdentCodeOID}
</update>
<select id="selectByCustomerId" parameterType="com.glxp.udi.admin.req.info.FilterFacidentcodeRequest"
resultType="com.glxp.udi.admin.res.basic.FacidentcodeResponse">
select
udi_facidentcode.UDI_FacIdentCodeOID,udi_standagency.issuingAgency,udi_facidentcode.IndentCode,
udi_standagency.AgencyName,udi_facidentcode.NoDigit,udi_facidentcode.Text1
from udi_facidentcode INNER JOIN udi_standagency
on udi_standagency.UDI_StandAgencyOID = udi_facidentcode.UDI_StandAgency_FK
select
udi_facidentcode.UDI_FacIdentCodeOID,udi_standagency.issuingAgency,udi_facidentcode.IndentCode,udi_facidentcode.isGenerate,
udi_standagency.AgencyName,udi_facidentcode.NoDigit,udi_facidentcode.Text1
from udi_facidentcode INNER JOIN udi_standagency
on udi_standagency.UDI_StandAgencyOID = udi_facidentcode.UDI_StandAgency_FK
<where>
<if test="agency != null and agency != ''">

54
api-udims/src/main/resources/mybatis/mapper/info/IdentifierDao.xml
Unescape Escape View File

@ -81,6 +81,24 @@
WHERE UDI_IdentifierOID=#{UDI_IdentifierOID}
</update>
<update id="updateIsUsed" parameterType="com.glxp.udi.admin.entity.info.IdentifierEntity">
UPDATE udi_identifier
<set>
<if test="GtinCode != null">GtinCode=#{GtinCode},</if>
<if test="isGTIN != null">isGTIN=#{isGTIN},</if>
<if test="IsReg != null">IsReg=#{IsReg},</if>
<if test="isSPTM != null">isSPTM=#{isSPTM},</if>
<if test="BZ != null">BZ=#{BZ},</if>
<if test="IsUDI != null">IsUDI=#{IsUDI},</if>
<if test="SeqNumber != null">SeqNumber=#{SeqNumber},</if>
<if test="UDI_FacIdentCode_FK != null">UDI_FacIdentCode_FK=#{UDI_FacIdentCode_FK},</if>
<if test="UDI_DeviceId_FK != null">UDI_DeviceId_FK=#{UDI_DeviceId_FK},</if>
</set>
WHERE IdentifierCode=#{IdentifierCode}
</update>
<select id="selectByfacident" parameterType="com.glxp.udi.admin.req.info.FilterIdentifierRequest"
resultType="com.glxp.udi.admin.entity.info.IdentifierEntity">
select * FROM udi_identifier
@ -88,8 +106,21 @@
<if test="IdentifierCode != null and IdentifierCode != ''">
and IdentifierCode like concat(#{IdentifierCode},'%')
</if>
</where>
<if test="IsUDI != null and IsUDI != ''">
and IsUDI = #{IsUDI}
</if>
<if test="isSPTM != null and isSPTM != ''">
and isSPTM = #{isSPTM}
</if>
<if test="IsReg != null and IsReg != ''">
and IsReg =#{IsReg}
</if>
<if test="facidentcode != null and facidentcode != ''">
and UDI_FacIdentCode_FK =#{facidentcode}
</if>
</where>
ORDER BY SeqNumber
</select>
<select id="randomCode" parameterType="com.glxp.udi.admin.req.info.FilterIdentifierRequest"
@ -108,9 +139,30 @@
<if test="IsReg != null and IsReg != ''">
and IsReg =#{IsReg}
</if>
<if test="facidentcode != null and facidentcode != ''">
and UDI_FacIdentCode_FK =#{facidentcode}
</if>
</where>
limit 1
</select>
<select id="isUsed" parameterType="java.lang.String"
resultType="java.lang.Integer">
select count(0) FROM udi_identifier
WHERE UDI_FacIdentCode_FK =#{facidentcode}
and (IsReg <![CDATA[ <> ]]> 0 or IsUDI <![CDATA[ <> ]]> 0
or isSPTM <![CDATA[ <> ]]> 0 or isGTIN <![CDATA[ <> ]]> 0)
</select>
<select id="isUsedIdentifyCode" parameterType="java.lang.String"
resultType="java.lang.Integer">
select count(0) FROM udi_identifier
WHERE IdentifierCode =#{code}
and (IsReg <![CDATA[ <> ]]> 0 or IsUDI <![CDATA[ <> ]]> 0
or isSPTM <![CDATA[ <> ]]> 0 or isGTIN <![CDATA[ <> ]]> 0)
</select>
</mapper>

2
api-udims/src/main/resources/mybatis/mapper/publish/ProductClassifyDao.xml
Unescape Escape View File

@ -5,6 +5,6 @@
<select id="selectAll" parameterType="com.glxp.udi.admin.req.publish.ProductclassifyRequest"
resultType="com.glxp.udi.admin.entity.publish.ProductClassifyEntity">
select * FROM productclassify where Level = #{Level} and QXLB = #{QXLB}
select * FROM productclassify where Level = #{Level} and QXLB = #{QXLB} order by Id
</select>
</mapper>

11
api-udims/src/main/resources/mybatis/mapper/publish/UdiDeviceIdDao.xml
Unescape Escape View File

@ -182,5 +182,16 @@
#{item}
</foreach>
</select>
<select id="selectByPriId" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.publish.UdiDeviceIdEntity">
select * FROM udi_deviceid WHERE primaryDeviceId = #{primaryDeviceId}
</select>
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.publish.UdiDeviceIdEntity">
select *
from udi_deviceid
WHERE UDI_DeviceIdOID=#{UDI_DeviceIdOID}
</select>
</mapper>

12
api-udims/src/main/resources/mybatis/mapper/publish/UdiProductDao.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<insert id="insertUdiProduct"
parameterType="com.glxp.udi.admin.entity.publish.UdiProductEntity">
insert INTO udi_product
(UDI_ProductOID,productName,UDI_Customer_FK,SYS_Created,SYS_LAST_UPD,Text1)
(UDI_ProductOID,productName,UDI_Customer_FK,SYS_Created,SYS_LAST_UPD,Text1,status)
values
(
#{UDI_ProductOID},
@ -15,7 +15,8 @@
#{UDI_Customer_FK},
#{SYS_Created},
#{SYS_LAST_UPD},
#{Text1}
#{Text1},
#{status}
)
</insert>
@ -23,7 +24,7 @@
<insert id="insertUdiProductList" keyProperty="id"
parameterType="com.glxp.udi.admin.entity.publish.UdiProductEntity">
insert INTO udi_product
(UDI_ProductOID,productName,UDI_Customer_FK,SYS_Created,SYS_LAST_UPD,Text1)
(UDI_ProductOID,productName,UDI_Customer_FK,SYS_Created,SYS_LAST_UPD,Text1,status)
VALUES
<foreach collection="udiProductEntities" item="item" index="index"
separator=",">
@ -32,7 +33,7 @@
#{item.productName},
#{item.UDI_Customer_FK},
#{item.SYS_Created},
#{item.SYS_LAST_UPD}, #{Text1}
#{item.SYS_LAST_UPD}, #{Text1},#{status}
)
</foreach>
</insert>
@ -42,6 +43,8 @@
</delete>
<update id="modifyUdiProduct" parameterType="com.glxp.udi.admin.entity.publish.UdiProductEntity">
UPDATE udi_product
<set>
@ -50,6 +53,7 @@
<if test="SYS_Created != null">SYS_Created=#{SYS_Created},</if>
<if test="Text1 != null">Text1=#{Text1},</if>
<if test="SYS_LAST_UPD != null">`SYS_LAST_UPD`=#{SYS_LAST_UPD},</if>
<if test="status != null">status=#{status},</if>
</set>
WHERE UDI_ProductOID = #{UDI_ProductOID}
</update>

41
api-udims/src/main/resources/mybatis/mapper/publish/UdiSubProductDao.xml
Unescape Escape View File

@ -16,8 +16,8 @@
reuseTimes,isDeviceSterile,isSterilizationUse,sterilizationMethod,
otherInfoLink,YBBM,deviceEndDate,specialText,
clinicalSizeText,SPTM,Quality,QualityUnit,
productOldName,UDI_Product_FK,UDI_Registration_FK,UDI_Enterprise_FK,
UDI_SubProduct_FK)
productOldName,UDI_Product_FK,UDI_Registration_FK,UDI_Enterprise_FK,productName,
UDI_SubProduct_FK,status)
values
(
#{UDI_SubProductOID}, #{SYS_Created}, #{SYS_LAST_UPD}, #{SYS_Deleted},
@ -28,8 +28,8 @@
#{reuseTimes}, #{isDeviceSterile}, #{isSterilizationUse}, #{sterilizationMethod},
#{otherInfoLink}, #{YBBM}, #{deviceEndDate}, #{specialText},
#{clinicalSizeText}, #{SPTM}, #{Quality}, #{QualityUnit},
#{productOldName}, #{UDI_Product_FK}, #{UDI_Registration_FK}, #{UDI_Enterprise_FK},
#{UDI_SubProduct_FK}
#{productOldName}, #{UDI_Product_FK}, #{UDI_Registration_FK}, #{UDI_Enterprise_FK},#{productName},
#{UDI_SubProduct_FK},#{status}
)
</insert>
@ -37,7 +37,7 @@
<insert id="insertUdiSubProductList" keyProperty="id"
parameterType="com.glxp.udi.admin.entity.publish.UdiSubProductEntity">
insert INTO udi_subproduct
( UDI_SubProductOID,SYS_Created,SYS_LAST_UPD,SYS_Deleted,
( UDI_SubProductOID,SYS_Created,SYS_LAST_UPD,SYS_Deleted,
brandName,productOldCode,productCode,companyName,
companyGBName,regcardCodes,businessLicense,deviceType,
productType,deviceKit,specification,deviceDescription,
@ -45,8 +45,8 @@
reuseTimes,isDeviceSterile,isSterilizationUse,sterilizationMethod,
otherInfoLink,YBBM,deviceEndDate,specialText,
clinicalSizeText,SPTM,Quality,QualityUnit,
productOldName,UDI_Product_FK,UDI_Registration_FK,UDI_Enterprise_FK,
UDI_SubProduct_FK)
productOldName,UDI_Product_FK,UDI_Registration_FK,UDI_Enterprise_FK,productName,
UDI_SubProduct_FK,status)
VALUES
<foreach collection="udiProductEntities" item="item" index="index"
separator=",">
@ -59,8 +59,9 @@
#{item.reuseTimes}, #{item.isDeviceSterile}, #{item.isSterilizationUse}, #{item.sterilizationMethod},
#{item.otherInfoLink}, #{item.YBBM}, #{item.deviceEndDate}, #{item.specialText},
#{item.clinicalSizeText}, #{item.SPTM}, #{item.Quality}, #{item.QualityUnit},
#{item.productOldName}, #{item.UDI_Product_FK}, #{item.UDI_Registration_FK}, #{item.UDI_Enterprise_FK},
#{item.UDI_SubProduct_FK}
#{item.productOldName}, #{item.UDI_Product_FK}, #{item.UDI_Registration_FK},
#{item.UDI_Enterprise_FK},#{productName},
#{item.UDI_SubProduct_FK},#{status}
)
</foreach>
@ -111,8 +112,11 @@
<if test="UDI_Registration_FK != null">UDI_Registration_FK=#{UDI_Registration_FK},</if>
<if test="UDI_Enterprise_FK != null">UDI_Enterprise_FK=#{UDI_Enterprise_FK},</if>
<if test="UDI_SubProduct_FK != null">UDI_SubProduct_FK=#{UDI_SubProduct_FK},</if>
<if test="status != null">status=#{status},</if>
</set>
WHERE UDI_SubProductOID=#{UDI_SubProductOID}
</update>
@ -124,15 +128,30 @@
<if test="specification != null and specification != ''">
and specification like concat('%',#{specification},'%')
</if>
<if test="status != null and status != ''">
and status = #{status}
</if>
<if test="productId != null and productId != ''">
and UDI_Product_FK = #{productId}
</if>
</where>
ORDER BY SYS_Created
</select>
<select id="selectCount" parameterType="java.lang.String"
resultType="java.lang.Integer">
select count(0)
from udi_subproduct
where UDI_Product_FK = #{productId}
</select>
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.publish.UdiSubProductEntity">
select *
from udi_subproduct
WHERE UDI_SubProductOID=#{UDI_SubProductOID}
</select>
</mapper>

31
api-udims/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml
Unescape Escape View File

@ -49,6 +49,7 @@
<result column="zxxsdyzsydydsl" jdbcType="VARCHAR" property="zxxsdyzsydydsl"/>
<result column="deviceHistoryRecordKey" jdbcType="VARCHAR" property="devicehistoryrecordkey"/>
<result column="bssjzt" jdbcType="VARCHAR" property="bssjzt"/>
<result column="customerId" jdbcType="VARCHAR" property="customerId"/>
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -164,7 +165,7 @@
ylqxzcrbarmc, ylqxzcrbarywmc, zczbhhzbapzbh,
zdcfsycs, zxxsdycpbs, bszt,
sfyzcbayz, zcbacpbs, zxxsdyzsydydsl,
deviceHistoryRecordKey, bssjzt)
deviceHistoryRecordKey, bssjzt,customerId)
values (#{uuid,jdbcType=VARCHAR}, #{devicerecordkey,jdbcType=VARCHAR}, #{btcpbs,jdbcType=VARCHAR},
#{btcpbsyzxxsdycpbssfyz,jdbcType=VARCHAR}, #{cgzmraqxgxx,jdbcType=VARCHAR}, #{cpbsbmtxmc,jdbcType=VARCHAR},
#{cpbsfbrq,jdbcType=VARCHAR}, #{cphhhbh,jdbcType=VARCHAR}, #{cplb,jdbcType=VARCHAR},
@ -180,7 +181,7 @@
#{ylqxzcrbarmc,jdbcType=VARCHAR}, #{ylqxzcrbarywmc,jdbcType=VARCHAR}, #{zczbhhzbapzbh,jdbcType=VARCHAR},
#{zdcfsycs,jdbcType=VARCHAR}, #{zxxsdycpbs,jdbcType=VARCHAR}, #{bszt,jdbcType=VARCHAR},
#{sfyzcbayz,jdbcType=VARCHAR}, #{zcbacpbs,jdbcType=VARCHAR}, #{zxxsdyzsydydsl,jdbcType=VARCHAR},
#{devicehistoryrecordkey,jdbcType=VARCHAR}, #{bssjzt,jdbcType=VARCHAR})
#{devicehistoryrecordkey,jdbcType=VARCHAR}, #{bssjzt,jdbcType=VARCHAR},#{customerId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.glxp.udi.admin.entity.udid.Device">
insert into device
@ -469,6 +470,9 @@
<if test="bssjzt != null">
#{bssjzt,jdbcType=VARCHAR},
</if>
<if test="customerId != null">
#{customerId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.glxp.udi.admin.entity.udid.DeviceExample"
@ -622,6 +626,9 @@
<if test="record.bssjzt != null">
bssjzt = #{record.bssjzt,jdbcType=VARCHAR},
</if>
<if test="record.customerId != null">
customerId = #{record.customerId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause"/>
@ -675,7 +682,8 @@
zcbacpbs = #{record.zcbacpbs,jdbcType=VARCHAR},
zxxsdyzsydydsl = #{record.zxxsdyzsydydsl,jdbcType=VARCHAR},
deviceHistoryRecordKey = #{record.devicehistoryrecordkey,jdbcType=VARCHAR},
bssjzt = #{record.bssjzt,jdbcType=VARCHAR}
bssjzt = #{record.bssjzt,jdbcType=VARCHAR},
customerId = #{record.customerId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause"/>
</if>
@ -821,6 +829,9 @@
<if test="bssjzt != null">
bssjzt = #{bssjzt,jdbcType=VARCHAR},
</if>
<if test="customerId != null">
customerId = #{customerId,jdbcType=VARCHAR},
</if>
</set>
where uuid = #{uuid,jdbcType=VARCHAR}
</update>
@ -871,7 +882,8 @@
zcbacpbs = #{zcbacpbs,jdbcType=VARCHAR},
zxxsdyzsydydsl = #{zxxsdyzsydydsl,jdbcType=VARCHAR},
deviceHistoryRecordKey = #{devicehistoryrecordkey,jdbcType=VARCHAR},
bssjzt = #{bssjzt,jdbcType=VARCHAR}
bssjzt = #{bssjzt,jdbcType=VARCHAR},
customerId = #{customerId,jdbcType=VARCHAR}
where uuid = #{uuid,jdbcType=VARCHAR}
</update>
@ -903,6 +915,9 @@
<if test="zczbhhzbapzbh != ''">
and zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh,jdbcType=VARCHAR},'%')
</if>
<if test="customerId != ''">
and customerId =#{customerId,jdbcType=VARCHAR}
</if>
</where>
limit #{page},#{limit}
@ -926,6 +941,9 @@
<if test="zczbhhzbapzbh != ''">
and zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh,jdbcType=VARCHAR},'%')
</if>
<if test="customerId != ''">
and customerId =#{customerId,jdbcType=VARCHAR}
</if>
</where>
</select>
@ -951,4 +969,9 @@
<select id="selectKey" parameterType="Map" resultType="java.lang.String">
SELECT uuid from device WHERE zxxsdycpbs = #{zxxsdycpbs} limit 1
</select>
<select id="selectDeviceRecordKey" parameterType="Map" resultType="java.lang.String">
SELECT deviceRecordKey from udi_deviceid WHERE udi_deviceid.`Status`=3 and udi_deviceid.UDI_Product_FK in (SELECT UDI_ProductOID FROM udi_product WHERE udi_product.UDI_Customer_FK = #{customerId})
</select>
</mapper>

BIN
api-udims/target/classes/META-INF/api-udims.kotlin_module
View File

Binary file not shown.

2
api-udims/target/classes/application-pro.properties
Unescape Escape View File

@ -2,7 +2,7 @@
server.port=9995
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udimsdb?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
server.servlet.context-path=

BIN
api-udims/target/classes/com/glxp/udi/ApiAdminApplication.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/annotation/AuthRuleAnnotation.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/aspect/AuthorizeAspect.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/CorsConfig.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/CorsFilter.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/DruidStatFilter.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/DruidStatViewServlet.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/MasterDataSourceConfig.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/PageHelperConfig.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/PublicFileUrlConfig.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/config/WebMvcConfig.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/constant/BussinessTypeUtils.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/constant/CookieConstant.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/constant/TestConstant.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/constant/TypeConstant.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/AuthAdminController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/AuthPermissionRuleController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/AuthRoleController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/CustomerContactController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/CustomerController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/LoginController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/auth/RegisterController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/device/DeviceController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/device/DownloadDeviceHelper.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/info/CompanyController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/info/EnterpriseCertController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/info/FacidentcodeController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/info/IdentifyCodeController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/info/StandagencyController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/inout/CodeContrastController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/inout/DruginfoController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/inout/OrderController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/inout/UnitController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/inout/WareHouseController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/inout/WhitecodeController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/publish/PostIdentifyController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/publish/ProductClassifyController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/publish/SubUdiProductController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/publish/UdiDeviceIdController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/publish/UdiProductController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/receipts/BussinessTypeController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/receipts/ManuOrderController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/receipts/MipsBarcodeController.class
View File

Binary file not shown.

BIN
api-udims/target/classes/com/glxp/udi/admin/controller/receipts/ProductController.class
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save