first commit
anthonywj
5 years ago
commit
11ed144b8d
@ -0,0 +1,25 @@
|
||||
/target/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
|
||||
### STS ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/build/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>udims</artifactId>
|
||||
<groupId>com.glxp</groupId>
|
||||
<version>0.0.1</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>api-common</artifactId>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.udi.common.constant;
|
||||
|
||||
/**
|
||||
* redis 常量
|
||||
*/
|
||||
public interface CacheConstant {
|
||||
|
||||
String ADMIN_AUTH_RULES = "admin_auth_rules:%s"; // 管理员的权限
|
||||
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.glxp.udi.common.converter;
|
||||
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Long 类型的 List 转为字符串
|
||||
*/
|
||||
public class LongList2StringConverter {
|
||||
|
||||
/**
|
||||
* Long 类型的 List 转为字符串
|
||||
* @param longList
|
||||
* @param regex
|
||||
* @return
|
||||
*/
|
||||
public static String convert(List<Long> longList, String regex) {
|
||||
|
||||
if (longList.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
Set<String> stringSet = new HashSet<>();
|
||||
for (Long value: longList){
|
||||
stringSet.add(value.toString());
|
||||
}
|
||||
if (stringSet.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
return StringUtils.join(stringSet, regex);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package com.glxp.udi.common.converter;
|
||||
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 字符串切割为 List<Long>
|
||||
*/
|
||||
public class String2LongListConverter {
|
||||
|
||||
/**
|
||||
*
|
||||
* @param string
|
||||
* @param regex 切割的字符
|
||||
* @return
|
||||
*/
|
||||
public static List<Long> convert(String string, String regex) {
|
||||
try {
|
||||
if (null == string || "".equals(string)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
String[] strings = string.split(regex);
|
||||
if (strings.length == 0) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
List<Long> longList = new ArrayList<>();
|
||||
for (String str : strings) {
|
||||
longList.add(Long.valueOf(str));
|
||||
}
|
||||
return longList;
|
||||
}catch (Exception e) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.glxp.udi.common.converter;
|
||||
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 字符串切割为 List<String>
|
||||
*/
|
||||
public class String2StringListConverter {
|
||||
|
||||
/**
|
||||
*
|
||||
* @param string
|
||||
* @param regex 切割的字符
|
||||
* @return
|
||||
*/
|
||||
public static List<String> convert(String string, String regex) {
|
||||
try {
|
||||
if (null == string || "".equals(string)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
String[] strings = string.split(regex);
|
||||
if (strings.length == 0) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return new ArrayList<>(Arrays.asList(strings));
|
||||
}catch (Exception e) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.glxp.udi.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 返回结果的枚举类
|
||||
*/
|
||||
@Getter
|
||||
public enum ResultEnum {
|
||||
|
||||
SUCCESS(0, "success"),
|
||||
NOT_NETWORK(1, "系统繁忙，请稍后再试。"),
|
||||
LOGIN_VERIFY_FALL(2, "登录失效"),
|
||||
PARAM_VERIFY_FALL(3, "参数验证错误"),
|
||||
AUTH_FAILED(4, "权限验证失败"),
|
||||
DATA_NOT(5, "没有相关数据"),
|
||||
DATA_CHANGE(6, "数据没有任何更改"),
|
||||
DATA_REPEAT(7, "数据已存在"),
|
||||
DATA_ERROR(8, "参数错误"),
|
||||
DATA_UNAUTH(9, "用户未认证"),
|
||||
;
|
||||
|
||||
private Integer code;
|
||||
|
||||
private String message;
|
||||
|
||||
ResultEnum(Integer code, String message) {
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
package com.glxp.udi.common.req;
|
||||
|
||||
/**
|
||||
* 分页的请求
|
||||
*/
|
||||
public class BaseLimitRequest extends BaseRequest {
|
||||
|
||||
/**
|
||||
* 页码
|
||||
*/
|
||||
private Integer page;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private Integer limit;
|
||||
|
||||
/**
|
||||
* 偏移量
|
||||
*/
|
||||
private Integer offset;
|
||||
|
||||
public Integer getPage() {
|
||||
return page;
|
||||
}
|
||||
|
||||
public void setPage(Integer page) {
|
||||
this.page = page;
|
||||
}
|
||||
|
||||
public Integer getLimit() {
|
||||
return limit;
|
||||
}
|
||||
|
||||
public void setLimit(Integer limit) {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public Integer getOffset() {
|
||||
return offset;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置偏移量
|
||||
*/
|
||||
public void setOffset() {
|
||||
if (null == this.getPage() || this.getPage() <= 0) {
|
||||
this.setPage(1);
|
||||
}
|
||||
if (null == this.getLimit() || this.getLimit() <= 0) {
|
||||
this.setLimit(10);
|
||||
}
|
||||
this.offset = (this.getPage() - 1) * this.getLimit();
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.udi.common.req;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class BaseRequest {
|
||||
|
||||
/**
|
||||
* 唯一请求号
|
||||
*/
|
||||
private String reqNo;
|
||||
|
||||
/**
|
||||
* 请求的时间戳
|
||||
*/
|
||||
private Long timeStamp;
|
||||
|
||||
public BaseRequest() {
|
||||
this.reqNo = UUID.randomUUID().toString();
|
||||
this.timeStamp = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
public String getReqNo() {
|
||||
return reqNo;
|
||||
}
|
||||
|
||||
public void setReqNo(String reqNo) {
|
||||
this.reqNo = reqNo;
|
||||
}
|
||||
|
||||
public Long getTimeStamp() {
|
||||
return timeStamp;
|
||||
}
|
||||
|
||||
public void setTimeStamp(Long timeStamp) {
|
||||
this.timeStamp = timeStamp;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.glxp.udi.common.res;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 返回结果类
|
||||
* @param <T>
|
||||
*/
|
||||
@Data
|
||||
public class BaseResponse<T> {
|
||||
|
||||
private Integer code;
|
||||
|
||||
private String message;
|
||||
|
||||
private T data;
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package com.glxp.udi.common.util;
|
||||
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 返回结果的操作类
|
||||
*/
|
||||
public class ResultVOUtils {
|
||||
|
||||
/**
|
||||
* 成功时返回
|
||||
* @param data 返回的data对象
|
||||
* @return {@link BaseResponse}
|
||||
*/
|
||||
public static BaseResponse success(Object data) {
|
||||
BaseResponse<Object> baseResponse = new BaseResponse<>();
|
||||
baseResponse.setCode(20000);
|
||||
baseResponse.setMessage("success");
|
||||
baseResponse.setData(data);
|
||||
return baseResponse;
|
||||
}
|
||||
|
||||
/**
|
||||
* 成功时返回
|
||||
* @return {@link BaseResponse}
|
||||
*/
|
||||
public static BaseResponse success() {
|
||||
Map data = new HashMap();
|
||||
return success(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 错误时返回
|
||||
* @param code 错误码
|
||||
* @param message 错误信息
|
||||
* @return {@link BaseResponse}
|
||||
*/
|
||||
public static BaseResponse error(Integer code, String message) {
|
||||
BaseResponse<Object> baseResponse = new BaseResponse<>();
|
||||
baseResponse.setCode(code);
|
||||
baseResponse.setMessage(message);
|
||||
Map data = new HashMap();
|
||||
baseResponse.setData(data);
|
||||
return baseResponse;
|
||||
}
|
||||
|
||||
/**
|
||||
* 错误时返回
|
||||
* @param resultEnum 错误枚举类
|
||||
* @return {@link BaseResponse}
|
||||
*/
|
||||
public static BaseResponse error(ResultEnum resultEnum) {
|
||||
return error(resultEnum.getCode(), resultEnum.getMessage());
|
||||
}
|
||||
|
||||
/**
|
||||
* 错误时返回
|
||||
* @param resultEnum 错误枚举类
|
||||
* @param message 错误的信息
|
||||
* @return {@link BaseResponse}
|
||||
*/
|
||||
public static BaseResponse error(ResultEnum resultEnum, String message) {
|
||||
return error(resultEnum.getCode(), message);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.glxp.udi.common.util;
|
||||
|
||||
|
||||
public class ResultVOUtilsTest {
|
||||
|
||||
public void success() {
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,4 @@
|
||||
#Created by Apache Maven 3.5.4
|
||||
groupId=com.glxp
|
||||
artifactId=api-common
|
||||
version=0.0.1
|
||||
@ -0,0 +1,9 @@
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\req\BaseLimitRequest.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\converter\LongList2StringConverter.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\constant\CacheConstant.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\res\BaseResponse.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\converter\String2LongListConverter.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\converter\String2StringListConverter.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\util\ResultVOUtils.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\req\BaseRequest.java
|
||||
D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\enums\ResultEnum.java
|
||||
@ -0,0 +1 @@
|
||||
D:\ylswork\SaleWarehouse\api-common\src\test\java\com\glxp\sale\common\util\ResultVOUtilsTest.java
|
||||
@ -0,0 +1,58 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.glxp.sale.common.util.ResultVOUtilsTest" time="0.007" tests="0" errors="0" skipped="0" failures="0">
|
||||
<properties>
|
||||
<property name="java.specification.version" value="14"/>
|
||||
<property name="sun.cpu.isalist" value="amd64"/>
|
||||
<property name="sun.jnu.encoding" value="GBK"/>
|
||||
<property name="java.class.path" value="D:\ylswork\SaleWarehouse\api-common\target\test-classes;D:\ylswork\SaleWarehouse\api-common\target\classes;D:\Program Files\maven\maven-repository\org\projectlombok\lombok\1.18.6\lombok-1.18.6.jar;D:\Program Files\maven\maven-repository\org\apache\commons\commons-lang3\3.9\commons-lang3-3.9.jar;"/>
|
||||
<property name="java.vm.vendor" value="Oracle Corporation"/>
|
||||
<property name="sun.arch.data.model" value="64"/>
|
||||
<property name="user.variant" value=""/>
|
||||
<property name="java.vendor.url" value="https://java.oracle.com/"/>
|
||||
<property name="user.timezone" value="GMT+08:00"/>
|
||||
<property name="os.name" value="Windows 10"/>
|
||||
<property name="java.vm.specification.version" value="14"/>
|
||||
<property name="sun.java.launcher" value="SUN_STANDARD"/>
|
||||
<property name="user.country" value="CN"/>
|
||||
<property name="sun.boot.library.path" value="C:\Program Files\Java\jdk-14.0.2\bin"/>
|
||||
<property name="sun.java.command" value="C:\Users\yewen\AppData\Local\Temp\surefire11294539595372133777\surefirebooter11627009231378106841.jar C:\Users\yewen\AppData\Local\Temp\surefire11294539595372133777 2020-11-11T22-12-52_072-jvmRun1 surefire5241565499038608356tmp surefire_0398784169093598879tmp"/>
|
||||
<property name="jdk.debug" value="release"/>
|
||||
<property name="surefire.test.class.path" value="D:\ylswork\SaleWarehouse\api-common\target\test-classes;D:\ylswork\SaleWarehouse\api-common\target\classes;D:\Program Files\maven\maven-repository\org\projectlombok\lombok\1.18.6\lombok-1.18.6.jar;D:\Program Files\maven\maven-repository\org\apache\commons\commons-lang3\3.9\commons-lang3-3.9.jar;"/>
|
||||
<property name="sun.cpu.endian" value="little"/>
|
||||
<property name="user.home" value="C:\Users\yewen"/>
|
||||
<property name="user.language" value="zh"/>
|
||||
<property name="java.specification.vendor" value="Oracle Corporation"/>
|
||||
<property name="java.version.date" value="2020-07-14"/>
|
||||
<property name="java.home" value="C:\Program Files\Java\jdk-14.0.2"/>
|
||||
<property name="file.separator" value="\"/>
|
||||
<property name="basedir" value="D:\ylswork\SaleWarehouse\api-common"/>
|
||||
<property name="java.vm.compressedOopsMode" value="32-bit"/>
|
||||
<property name="line.separator" value=" "/>
|
||||
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
|
||||
<property name="java.specification.name" value="Java Platform API Specification"/>
|
||||
<property name="surefire.real.class.path" value="C:\Users\yewen\AppData\Local\Temp\surefire11294539595372133777\surefirebooter11627009231378106841.jar"/>
|
||||
<property name="user.script" value=""/>
|
||||
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
|
||||
<property name="java.runtime.version" value="14.0.2+12-46"/>
|
||||
<property name="user.name" value="yewen"/>
|
||||
<property name="path.separator" value=";"/>
|
||||
<property name="os.version" value="10.0"/>
|
||||
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
|
||||
<property name="file.encoding" value="GBK"/>
|
||||
<property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
|
||||
<property name="localRepository" value="D:\Program Files\maven\maven-repository"/>
|
||||
<property name="java.vendor.url.bug" value="https://bugreport.java.com/bugreport/"/>
|
||||
<property name="java.io.tmpdir" value="C:\Users\yewen\AppData\Local\Temp\"/>
|
||||
<property name="java.version" value="14.0.2"/>
|
||||
<property name="user.dir" value="D:\ylswork\SaleWarehouse\api-common"/>
|
||||
<property name="os.arch" value="amd64"/>
|
||||
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
|
||||
<property name="sun.os.patch.level" value=""/>
|
||||
<property name="java.library.path" value="C:\Program Files\Java\jdk-14.0.2\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Java\jdk-14.0.2\bin\;C:\Python38\Scripts\;C:\Python38\;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\windows\system32;C:\windows;C:\windows\System32\Wbem;C:\windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\Git\cmd;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\TortoiseGit\bin;C:\Program Files (x86)\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\DTS\Binn\;C:\Program Files\nodejs\;C:\ProgramData\chocolatey\bin;D:\Program Files\maven\apache-maven-3.5.4\bin\;C:\Program Files\MySQL\MySQL Shell 8.0\bin\;C:\Users\yewen\AppData\Local\Microsoft\WindowsApps;;D:\Program Files (x86)\Egret\Egret Wing 3\bin;d:\Users\yewen\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\yewen\AppData\Roaming\npm;D:\Program Files\JetBrains\IntelliJ IDEA 2018.3.2\bin;;."/>
|
||||
<property name="java.vm.info" value="mixed mode, sharing"/>
|
||||
<property name="java.vendor" value="Oracle Corporation"/>
|
||||
<property name="java.vm.version" value="14.0.2+12-46"/>
|
||||
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
|
||||
<property name="java.class.version" value="58.0"/>
|
||||
</properties>
|
||||
</testsuite>
|
||||
@ -0,0 +1,4 @@
|
||||
-------------------------------------------------------------------------------
|
||||
Test set: com.glxp.sale.common.util.ResultVOUtilsTest
|
||||
-------------------------------------------------------------------------------
|
||||
Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s - in com.glxp.sale.common.util.ResultVOUtilsTest
|
||||
Binary file not shown.
@ -0,0 +1,27 @@
|
||||
package com.glxp.udi;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.boot.web.servlet.ServletComponentScan;
|
||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||
|
||||
|
||||
@SpringBootApplication
|
||||
@ServletComponentScan
|
||||
public class ApiAdminApplication extends SpringBootServletInitializer {
|
||||
|
||||
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(ApiAdminApplication.class, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
|
||||
|
||||
return builder.sources(ApiAdminApplication.class);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.glxp.udi.admin.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 后台登录授权/权限验证的注解
|
||||
*/
|
||||
//此注解只能修饰方法
|
||||
@Target(ElementType.METHOD)
|
||||
//当前注解如何去保持
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface AuthRuleAnnotation {
|
||||
String value();
|
||||
}
|
||||
@ -0,0 +1,108 @@
|
||||
package com.glxp.udi.admin.aspect;
|
||||
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.service.auth.AuthLoginService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.admin.util.JwtUtils;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Before;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.aspectj.lang.reflect.MethodSignature;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 登录验证 AOP
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
@Slf4j
|
||||
public class AuthorizeAspect {
|
||||
|
||||
@Resource
|
||||
private AuthLoginService authLoginService;
|
||||
|
||||
@Pointcut("@annotation(com.glxp.udi.admin.annotation.AuthRuleAnnotation)")
|
||||
public void adminLoginVerify() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 登录验证
|
||||
*
|
||||
* @param joinPoint
|
||||
*/
|
||||
@Before("adminLoginVerify()")
|
||||
public void doAdminAuthVerify(JoinPoint joinPoint) {
|
||||
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
|
||||
String id = request.getHeader("ADMIN_ID");
|
||||
String query = request.getQueryString();
|
||||
Long adminId = null;
|
||||
try {
|
||||
adminId = Long.valueOf(id);
|
||||
}catch (Exception e) {
|
||||
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
|
||||
}
|
||||
|
||||
String token = request.getHeader("ADMIN_TOKEN");
|
||||
if (token == null) {
|
||||
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
|
||||
}
|
||||
|
||||
// 验证 token
|
||||
Claims claims = JwtUtils.parse(token);
|
||||
if (claims == null) {
|
||||
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
|
||||
}
|
||||
Long jwtAdminId = Long.valueOf(claims.get("admin_id").toString());
|
||||
if (adminId.compareTo(jwtAdminId) != 0) {
|
||||
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
|
||||
}
|
||||
|
||||
// 判断是否进行权限验证
|
||||
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
||||
//从切面中获取当前方法
|
||||
Method method = signature.getMethod();
|
||||
//得到了方,提取出他的注解
|
||||
AuthRuleAnnotation action = method.getAnnotation(AuthRuleAnnotation.class);
|
||||
// 进行权限验证
|
||||
// authRuleVerify(action.value(), adminId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 权限验证
|
||||
*
|
||||
* @param authRule
|
||||
*/
|
||||
private void authRuleVerify(String authRule, Long adminId) {
|
||||
|
||||
if (authRule != null && authRule.length() > 0) {
|
||||
|
||||
List<String> authRules = authLoginService.listRuleByAdminId(adminId);
|
||||
// admin 为最高权限
|
||||
for (String item : authRules) {
|
||||
if (item.equals("admin") || item.equals(authRule)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
throw new JsonException(ResultEnum.AUTH_FAILED);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 跨域配置
|
||||
*/
|
||||
@Data
|
||||
@Configuration
|
||||
@Component
|
||||
@ConfigurationProperties(prefix = "cors")
|
||||
public class CorsConfig {
|
||||
|
||||
// 允许的域
|
||||
private String allowedOrigins;
|
||||
// 允许的方法
|
||||
private String allowedMethods;
|
||||
// 允许的头信息
|
||||
private String allowedHeaders;
|
||||
private String coallowedCredentials;
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import javax.servlet.*;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
|
||||
//@WebFilter(urlPatterns = "/*", filterName = "corsFilter")
|
||||
public class CorsFilter implements Filter {
|
||||
|
||||
@Autowired
|
||||
private CorsConfig corsConfig;
|
||||
|
||||
@Override
|
||||
public void destroy() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
|
||||
throws IOException, ServletException {
|
||||
HttpServletResponse response = (HttpServletResponse) res;
|
||||
response.setHeader("Access-Control-Allow-Origin", corsConfig.getAllowedOrigins());
|
||||
response.setHeader("Access-Control-Allow-Methods", corsConfig.getAllowedMethods());
|
||||
response.setHeader("Access-Control-Allow-Headers", corsConfig.getAllowedHeaders());
|
||||
response.setHeader("Access-Control-Allow-Credentials", "true");
|
||||
// response.setHeader("Access-Control-Allow-Origin", "*");
|
||||
// response.setHeader("Access-Control-Allow-Methods", "Content-Type,ADMIN_ID,ADMIN_TOKEN");
|
||||
// response.setHeader("Access-Control-Allow-Headers", "GET,POST");
|
||||
chain.doFilter(req, res);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(FilterConfig arg0) throws ServletException {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
import com.alibaba.druid.support.http.WebStatFilter;
|
||||
|
||||
import javax.servlet.annotation.WebFilter;
|
||||
import javax.servlet.annotation.WebInitParam;
|
||||
|
||||
/**
|
||||
* 配置监控拦截器 (过滤不需要监控的后缀)
|
||||
* druid监控拦截器
|
||||
*/
|
||||
@WebFilter(filterName = "druidWebStatFilter", urlPatterns = "/*",
|
||||
initParams = {
|
||||
@WebInitParam(name = "exclusions", value = "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")//忽略资源
|
||||
}
|
||||
)
|
||||
public class DruidStatFilter extends WebStatFilter {
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
import org.apache.ibatis.session.SqlSessionFactory;
|
||||
import org.mybatis.spring.SqlSessionFactoryBean;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.jdbc.DataSourceBuilder;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
|
||||
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
@Configuration
|
||||
// 扫描 Mapper 接口并容器管理
|
||||
@MapperScan(basePackages = MasterDataSourceConfig.PACKAGE, sqlSessionFactoryRef = "masterSqlSessionFactory")
|
||||
public class MasterDataSourceConfig {
|
||||
|
||||
// 精确到 master 目录，以便跟其他数据源隔离
|
||||
static final String PACKAGE = "com.glxp.udi.admin.dao";
|
||||
static final String MAPPER_LOCATION = "classpath:mybatis/mapper/*/*.xml";
|
||||
|
||||
@Bean(name = "masterDataSource")
|
||||
@ConfigurationProperties(prefix = "spring.datasource")
|
||||
@Primary
|
||||
public DataSource masterDataSource() {
|
||||
return DataSourceBuilder.create().build();
|
||||
}
|
||||
|
||||
@Bean(name = "masterTransactionManager")
|
||||
@Primary
|
||||
public DataSourceTransactionManager masterTransactionManager() {
|
||||
return new DataSourceTransactionManager(masterDataSource());
|
||||
}
|
||||
|
||||
@Bean(name = "masterSqlSessionFactory")
|
||||
@Primary
|
||||
public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource)
|
||||
throws Exception {
|
||||
final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
|
||||
sessionFactory.setDataSource(masterDataSource);
|
||||
sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
|
||||
.getResources(MasterDataSourceConfig.MAPPER_LOCATION));
|
||||
return sessionFactory.getObject();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
@Configuration
|
||||
public class PageHelperConfig {
|
||||
|
||||
/**
|
||||
* 注入pagehelper配置
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Bean
|
||||
public PageHelper getPageHelper() {
|
||||
PageHelper pageHelper = new PageHelper();
|
||||
Properties properties = new Properties();
|
||||
properties.setProperty("helperDialect", "mysql");
|
||||
properties.setProperty("reasonable", "true");
|
||||
properties.setProperty("supportMethodsArguments", "true");
|
||||
properties.setProperty("params", "count=countSql");
|
||||
pageHelper.setProperties(properties);
|
||||
return pageHelper;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* 公共文件的配置
|
||||
*/
|
||||
|
||||
@Configuration
|
||||
@ConfigurationProperties(prefix = "publish-file")
|
||||
public class PublicFileUrlConfig {
|
||||
|
||||
/**
|
||||
* 上传的地址
|
||||
*/
|
||||
private static String uploadUrl;
|
||||
|
||||
public void setUploadUrl(String uploadUrl) {
|
||||
PublicFileUrlConfig.uploadUrl = uploadUrl;
|
||||
}
|
||||
|
||||
public static String getUploadUrl() {
|
||||
return uploadUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
* 资源的域名
|
||||
*/
|
||||
private static String domain;
|
||||
|
||||
public void setDomain(String domain) {
|
||||
PublicFileUrlConfig.domain = domain;
|
||||
}
|
||||
|
||||
public static String getDomain() {
|
||||
return domain;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.glxp.udi.admin.config;
|
||||
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
@Configuration
|
||||
public class WebMvcConfig implements WebMvcConfigurer {
|
||||
|
||||
@Override
|
||||
public void addCorsMappings(CorsRegistry registry) {
|
||||
|
||||
//设置允许跨域的路径
|
||||
registry.addMapping("/**")
|
||||
//设置允许跨域请求的域名
|
||||
.allowedOrigins("*")
|
||||
//是否允许证书 不再默认开启
|
||||
.allowCredentials(true)
|
||||
//设置允许的方法
|
||||
.allowedMethods("*")
|
||||
//跨域允许时间
|
||||
.maxAge(3600);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.glxp.udi.admin.constant;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class BussinessTypeUtils {
|
||||
|
||||
public static List<String> getBusssinessTypes() {
|
||||
List<String> types = new ArrayList<>();
|
||||
types.add(TypeConstant.TYPE_PUT_PRODUCT);
|
||||
types.add(TypeConstant.TYPE_PUT_PURCHASE);
|
||||
types.add(TypeConstant.TYPE_PUT_RETURN);
|
||||
types.add(TypeConstant.TYPE_PUT_ALLOT);
|
||||
types.add(TypeConstant.TYPE_OUT_RETURN);
|
||||
types.add(TypeConstant.TYPE_OUT_DESTORY);
|
||||
types.add(TypeConstant.TYPE_OUT_STRAIGHT);
|
||||
types.add(TypeConstant.TYPE_OUT_REWORK);
|
||||
types.add(TypeConstant.TYPE_OUT_CHECK);
|
||||
types.add(TypeConstant.TYPE_CODE_REPLACE);
|
||||
types.add(TypeConstant.TYPE_CODE_DESTORY);
|
||||
types.add(TypeConstant.TYPE_STOCK_CHECK);
|
||||
types.add(TypeConstant.TYPE_OUT_SALE);
|
||||
types.add(TypeConstant.TYPE_OUT_ALLOT);
|
||||
return types;
|
||||
}
|
||||
|
||||
public static Map<String,String> getBusssinessTypeMap() {
|
||||
Map<String,String> types = new HashMap<>();
|
||||
types.put("生产入库",TypeConstant.TYPE_PUT_PRODUCT);
|
||||
types.put("采购入库",TypeConstant.TYPE_PUT_PURCHASE);
|
||||
types.put("退货入库",TypeConstant.TYPE_PUT_RETURN);
|
||||
types.put("调拨入库",TypeConstant.TYPE_PUT_ALLOT);
|
||||
types.put("退货出库",TypeConstant.TYPE_OUT_RETURN);
|
||||
types.put("销毁出库",TypeConstant.TYPE_OUT_DESTORY);
|
||||
types.put("直调出库",TypeConstant.TYPE_OUT_STRAIGHT);
|
||||
types.put("返工出库",TypeConstant.TYPE_OUT_REWORK);
|
||||
types.put("抽检出库",TypeConstant.TYPE_OUT_CHECK);
|
||||
types.put("码替换",TypeConstant.TYPE_CODE_REPLACE);
|
||||
types.put("码注销",TypeConstant.TYPE_CODE_DESTORY);
|
||||
types.put("盘点",TypeConstant.TYPE_STOCK_CHECK);
|
||||
types.put("销售出库",TypeConstant.TYPE_OUT_SALE);
|
||||
types.put("调拨出库",TypeConstant.TYPE_OUT_ALLOT);
|
||||
return types;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.udi.admin.constant;
|
||||
|
||||
/**
|
||||
* cookie常量
|
||||
*/
|
||||
public interface CookieConstant {
|
||||
|
||||
String TOKEN = "token";
|
||||
|
||||
Integer EXPIRE = 7200;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.udi.admin.constant;
|
||||
|
||||
/**
|
||||
* cookie常量
|
||||
*/
|
||||
public interface TestConstant {
|
||||
|
||||
String TOKEN = "token";
|
||||
|
||||
Integer EXPIRE = 7200;
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.glxp.udi.admin.constant;
|
||||
|
||||
public interface TypeConstant {
|
||||
|
||||
String TYPE_PUT_PRODUCT = "ProduceWareHouseIn"; //生产入库
|
||||
String TYPE_PUT_PURCHASE = "PurchaseWareHouseIn"; //采购入库
|
||||
String TYPE_PUT_RETURN = "ReturnWareHouseIn"; //退货入库
|
||||
String TYPE_PUT_ALLOT = "AllocateWareHouseIn"; //调拨入库
|
||||
|
||||
String TYPE_OUT_SALE = "SalesWareHouseOut"; //销售出库
|
||||
String TYPE_OUT_RETURN = "ReturnWareHouseOut"; //退货出库
|
||||
String TYPE_OUT_ALLOT = "AllocateWareHouseOut"; //调拨出库
|
||||
String TYPE_OUT_DESTORY = "DestoryWareHouseOut"; //销毁出库
|
||||
String TYPE_OUT_STRAIGHT = "DirectAllocateWareHouseOut"; //直调出库
|
||||
String TYPE_OUT_REWORK = "ReworkWareHouseOut"; //返工出库
|
||||
String TYPE_OUT_CHECK = "CheckWareHouseOut"; //盘点 抽检出库
|
||||
String TYPE_CODE_REPLACE = "CodeReplace"; //码替换
|
||||
String TYPE_CODE_DESTORY = "CodeDestory"; //码注销
|
||||
String TYPE_STOCK_CHECK = "StockCheck"; //盘点
|
||||
|
||||
|
||||
String TYPE_PUT = "WareHouseIn"; //出库
|
||||
String TYPE_OUT = "WareHouseOut"; //入库
|
||||
}
|
||||
@ -0,0 +1,267 @@
|
||||
package com.glxp.udi.admin.controller.auth;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.auth.CustomerInfoEntity;
|
||||
import com.glxp.udi.admin.req.auth.AuthAdminQueryRequest;
|
||||
import com.glxp.udi.admin.req.auth.AuthAdminSaveRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.auth.CustomerInfoService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.auth.AuthRole;
|
||||
import com.glxp.udi.admin.entity.auth.AuthRoleAdmin;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.auth.AuthRoleAdminService;
|
||||
import com.glxp.udi.admin.service.auth.AuthRoleService;
|
||||
import com.glxp.udi.admin.util.PasswordUtils;
|
||||
import com.glxp.udi.admin.res.auth.AuthAdminRoleResponse;
|
||||
import com.glxp.udi.admin.res.auth.AuthAdminResponse;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 管理员相关
|
||||
*/
|
||||
@RestController
|
||||
public class AuthAdminController {
|
||||
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
|
||||
@Resource
|
||||
private AuthRoleService authRoleService;
|
||||
|
||||
@Resource
|
||||
private AuthRoleAdminService authRoleAdminService;
|
||||
@Resource
|
||||
private CustomerInfoService customerInfoService;
|
||||
|
||||
/**
|
||||
* 获取管理员列表
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/admin/index")
|
||||
@GetMapping("/admin/auth/admin/index")
|
||||
public BaseResponse index(@Valid AuthAdminQueryRequest authAdminQueryRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (authAdminQueryRequest.getRoleId() != null) {
|
||||
List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByRoleId(authAdminQueryRequest.getRoleId());
|
||||
List<Long> ids = new ArrayList<>();
|
||||
if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) {
|
||||
ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdmin_id).collect(Collectors.toList());
|
||||
}
|
||||
authAdminQueryRequest.setIds(ids);
|
||||
}
|
||||
List<AuthAdmin> authAdminList = authAdminService.listAdminPage(authAdminQueryRequest);
|
||||
// List<AuthAdmin> authAdminList = new ArrayList<>();
|
||||
// for (AuthAdmin authAdmin : authAdmins) {
|
||||
// if (!authAdmin.getUserName().equals("admin")) {
|
||||
// authAdminList.add(authAdmin);
|
||||
// }
|
||||
// }
|
||||
// 查询所有的权限
|
||||
List<Long> adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList());
|
||||
List<AuthRoleAdmin> authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds);
|
||||
|
||||
// 视图列表
|
||||
List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
|
||||
AuthAdminResponse authAdminResponse = new AuthAdminResponse();
|
||||
BeanUtils.copyProperties(item, authAdminResponse);
|
||||
List<Long> roles = authRoleAdminList.stream()
|
||||
.filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id()))
|
||||
.map(AuthRoleAdmin::getRole_id)
|
||||
.collect(Collectors.toList());
|
||||
authAdminResponse.setRoles(roles);
|
||||
return authAdminResponse;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdminList);
|
||||
PageSimpleResponse<AuthAdminResponse> authAdminPageSimpleResponse = new PageSimpleResponse<>();
|
||||
authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
|
||||
authAdminPageSimpleResponse.setList(authAdminResponseList);
|
||||
|
||||
return ResultVOUtils.success(authAdminPageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取角色列表
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/admin/roleList")
|
||||
@GetMapping("/admin/auth/admin/roleList")
|
||||
public BaseResponse roleList(@RequestParam(value = "page", defaultValue = "1") Integer page,
|
||||
@RequestParam(value = "limit", defaultValue = "100") Integer limit) {
|
||||
|
||||
List<AuthRole> authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null);
|
||||
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
|
||||
PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
|
||||
AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
|
||||
BeanUtils.copyProperties(e, authAdminRoleResponse);
|
||||
return authAdminRoleResponse;
|
||||
}).collect(Collectors.toList());
|
||||
pageSimpleResponse.setList(authAdminRoleResponses);
|
||||
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("admin/auth/admin/customerRoles")
|
||||
@GetMapping("/admin/auth/admin/customerRoles")
|
||||
public BaseResponse customerRoles(@RequestParam(value = "page", defaultValue = "1") Integer page,
|
||||
@RequestParam(value = "limit", defaultValue = "100") Integer limit) {
|
||||
|
||||
List<AuthRole> authRoleList = authRoleService.listCustomerRoles(page, limit, 1);
|
||||
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
|
||||
PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
|
||||
AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
|
||||
BeanUtils.copyProperties(e, authAdminRoleResponse);
|
||||
return authAdminRoleResponse;
|
||||
}).collect(Collectors.toList());
|
||||
pageSimpleResponse.setList(authAdminRoleResponses);
|
||||
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/admin/save")
|
||||
@PostMapping("/admin/auth/admin/save")
|
||||
public BaseResponse save(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (authAdminSaveRequest.getCustomerId() != null) {
|
||||
CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdminSaveRequest.getCustomerId());
|
||||
int max = customerInfoEntity.getUserMax();
|
||||
int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId());
|
||||
if (count >= max) {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大人数");
|
||||
}
|
||||
}
|
||||
|
||||
// 检查是否存在相同名称的管理员
|
||||
AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
|
||||
if (byUserName != null) {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在");
|
||||
}
|
||||
|
||||
AuthAdmin authAdmin = new AuthAdmin();
|
||||
BeanUtils.copyProperties(authAdminSaveRequest, authAdmin);
|
||||
|
||||
if (authAdmin.getPassWord() != null) {
|
||||
authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
|
||||
}
|
||||
authAdmin.setCustomerId((long) 110);
|
||||
boolean b = authAdminService.insertAuthAdmin(authAdmin);
|
||||
authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
|
||||
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
// 插入角色
|
||||
if (authAdminSaveRequest.getRoles() != null) {
|
||||
authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());
|
||||
}
|
||||
|
||||
Map<String, Long> res = new HashMap<>();
|
||||
res.put("id", authAdmin.getId());
|
||||
return ResultVOUtils.success(res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/admin/edit")
|
||||
@PostMapping("/admin/auth/admin/edit")
|
||||
public BaseResponse edit(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (authAdminSaveRequest.getId() == null) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
|
||||
}
|
||||
|
||||
// 检查是否存在除了当前管理员的其它名称的管理员
|
||||
AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
|
||||
if (byUserName != null && !authAdminSaveRequest.getId().equals(byUserName.getId())) {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在");
|
||||
}
|
||||
|
||||
AuthAdmin authAdmin = new AuthAdmin();
|
||||
BeanUtils.copyProperties(authAdminSaveRequest, authAdmin);
|
||||
if (authAdmin.getPassWord() != null) {
|
||||
authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
|
||||
}
|
||||
|
||||
boolean b = authAdminService.updateAuthAdmin(authAdmin);
|
||||
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
// 修改角色
|
||||
if (authAdminSaveRequest.getRoles() != null) {
|
||||
// 先删除之前的
|
||||
authRoleAdminService.deleteByAdminId(authAdmin.getId());
|
||||
authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());
|
||||
}
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/admin/delete")
|
||||
@PostMapping("/admin/auth/admin/delete")
|
||||
public BaseResponse delete(@RequestBody AuthAdminSaveRequest authAdminSaveRequest) {
|
||||
|
||||
if (authAdminSaveRequest.getId() == null) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
|
||||
}
|
||||
|
||||
boolean b = authAdminService.deleteById(authAdminSaveRequest.getId());
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
// 先删除之前的角色
|
||||
authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId());
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,133 @@
|
||||
package com.glxp.udi.admin.controller.auth;
|
||||
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.req.auth.AuthPermissionRuleSaveRequest;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import com.glxp.udi.admin.entity.auth.AuthPermissionRule;
|
||||
import com.glxp.udi.admin.service.auth.AuthPermissionRuleService;
|
||||
import com.glxp.udi.admin.util.PermissionRuleTreeUtils;
|
||||
import com.glxp.udi.admin.res.auth.AuthPermissionRuleMergeResponse;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 权限规则相关
|
||||
*/
|
||||
@RestController
|
||||
public class AuthPermissionRuleController {
|
||||
|
||||
@Resource
|
||||
private AuthPermissionRuleService authPermissionRuleService;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/permission_rule/index")
|
||||
@GetMapping("/admin/auth/permission_rule/index")
|
||||
public BaseResponse index() {
|
||||
|
||||
|
||||
List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listAll();
|
||||
List<AuthPermissionRuleMergeResponse> merge = PermissionRuleTreeUtils.merge(authPermissionRuleList,0L);
|
||||
|
||||
Map<String,Object> restMap = new HashMap<>();
|
||||
restMap.put("list", merge);
|
||||
return ResultVOUtils.success(restMap);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* @param authPermissionRuleSaveRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/permission_rule/save")
|
||||
@PostMapping("/admin/auth/permission_rule/save")
|
||||
public BaseResponse save(@RequestBody @Valid AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (authPermissionRuleSaveRequest.getPid() == null) {
|
||||
authPermissionRuleSaveRequest.setPid(0L); // 默认设置
|
||||
}
|
||||
AuthPermissionRule authPermissionRule = new AuthPermissionRule();
|
||||
BeanUtils.copyProperties(authPermissionRuleSaveRequest, authPermissionRule);
|
||||
|
||||
boolean b = authPermissionRuleService.insertAuthPermissionRule(authPermissionRule);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
Map<String, Long> res = new HashMap<>();
|
||||
res.put("id", authPermissionRule.getId());
|
||||
return ResultVOUtils.success(res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param authPermissionRuleSaveRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/permission_rule/edit")
|
||||
@PostMapping("/admin/auth/permission_rule/edit")
|
||||
public BaseResponse edit(@RequestBody @Valid AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (authPermissionRuleSaveRequest.getId() == null) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
||||
}
|
||||
|
||||
authPermissionRuleSaveRequest.setPid(null); // 不能修改父级 pid
|
||||
|
||||
AuthPermissionRule authPermissionRule = new AuthPermissionRule();
|
||||
BeanUtils.copyProperties(authPermissionRuleSaveRequest, authPermissionRule);
|
||||
|
||||
boolean b = authPermissionRuleService.updateAuthPermissionRule(authPermissionRule);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
* @param authPermissionRuleSaveRequest
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/permission_rule/delete")
|
||||
@PostMapping("/admin/auth/permission_rule/delete")
|
||||
public BaseResponse delete(@RequestBody AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest) {
|
||||
|
||||
if (authPermissionRuleSaveRequest.getId() == null) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
||||
}
|
||||
|
||||
boolean b = authPermissionRuleService.deleteById(authPermissionRuleSaveRequest.getId());
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,224 @@
|
||||
package com.glxp.udi.admin.controller.auth;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.req.auth.AuthRoleAuthRequest;
|
||||
import com.glxp.udi.admin.req.auth.AuthRoleQueryRequest;
|
||||
import com.glxp.udi.admin.req.auth.AuthRoleSaveRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.auth.AuthPermission;
|
||||
import com.glxp.udi.admin.entity.auth.AuthPermissionRule;
|
||||
import com.glxp.udi.admin.entity.auth.AuthRole;
|
||||
import com.glxp.udi.admin.service.auth.AuthPermissionRuleService;
|
||||
import com.glxp.udi.admin.service.auth.AuthPermissionService;
|
||||
import com.glxp.udi.admin.service.auth.AuthRoleService;
|
||||
import com.glxp.udi.admin.util.PermissionRuleTreeUtils;
|
||||
import com.glxp.udi.admin.res.auth.AuthPermissionRuleMergeResponse;
|
||||
import com.glxp.udi.admin.res.auth.AuthRoleResponse;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 角色相关
|
||||
*/
|
||||
@RestController
|
||||
public class AuthRoleController {
|
||||
|
||||
@Resource
|
||||
private AuthRoleService authRoleService;
|
||||
|
||||
@Resource
|
||||
private AuthPermissionRuleService authPermissionRuleService;
|
||||
|
||||
@Resource
|
||||
private AuthPermissionService authPermissionService;
|
||||
|
||||
/**
|
||||
* 角色列表
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/role/index")
|
||||
@GetMapping("/admin/auth/role/index")
|
||||
public BaseResponse index(@Valid AuthRoleQueryRequest authRoleQueryRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<AuthRole> authRoleList = authRoleService.listAdminPage(authRoleQueryRequest);
|
||||
List<AuthRoleResponse> authRoleResponseList = authRoleList.stream().map(item -> {
|
||||
AuthRoleResponse authRoleResponse = new AuthRoleResponse();
|
||||
BeanUtils.copyProperties(item, authRoleResponse);
|
||||
return authRoleResponse;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
|
||||
PageSimpleResponse<AuthRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(authRoleResponseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取授权列表
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/role/authList")
|
||||
@GetMapping("/admin/auth/role/authList")
|
||||
public BaseResponse authList(@RequestParam("id") Long id) {
|
||||
|
||||
// 查询当前角色拥有的权限id
|
||||
List<AuthPermission> authPermissionList = authPermissionService.listByRoleId(id);
|
||||
List<Long> checkedKeys = authPermissionList.stream()
|
||||
.map(AuthPermission::getPermissionRuleId)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 查询所有权限规则
|
||||
List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listAll();
|
||||
List<AuthPermissionRuleMergeResponse> merge = PermissionRuleTreeUtils.merge(authPermissionRuleList, 0L);
|
||||
|
||||
Map<String, Object> restMap = new HashMap<>();
|
||||
restMap.put("list", merge);
|
||||
restMap.put("checkedKeys", checkedKeys);
|
||||
return ResultVOUtils.success(restMap);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("admin/auth/role/auth")
|
||||
@PostMapping("/admin/auth/role/auth")
|
||||
public BaseResponse auth(@RequestBody @Valid AuthRoleAuthRequest authRoleAuthRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
// 先删除之前的授权
|
||||
authPermissionService.deleteByRoleId(authRoleAuthRequest.getRole_id());
|
||||
|
||||
List<AuthPermission> authPermissionList = authRoleAuthRequest.getAuth_rules().stream()
|
||||
.map(aLong -> {
|
||||
AuthPermission authPermission = new AuthPermission();
|
||||
authPermission.setRoleId(authRoleAuthRequest.getRole_id());
|
||||
authPermission.setPermissionRuleId(aLong);
|
||||
authPermission.setType("admin");
|
||||
return authPermission;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
int i = authPermissionService.insertAuthPermissionAll(authPermissionList);
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param authRoleSaveRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/role/save")
|
||||
@PostMapping("/admin/auth/role/save")
|
||||
public BaseResponse save(@RequestBody @Valid AuthRoleSaveRequest authRoleSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
AuthRole byName = authRoleService.findByName(authRoleSaveRequest.getName());
|
||||
if (byName != null) {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前角色已存在");
|
||||
}
|
||||
|
||||
AuthRole authRole = new AuthRole();
|
||||
BeanUtils.copyProperties(authRoleSaveRequest, authRole);
|
||||
|
||||
boolean b = authRoleService.insertAuthRole(authRole);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
Map<String, Long> res = new HashMap<>();
|
||||
res.put("id", authRole.getId());
|
||||
return ResultVOUtils.success(res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param authRoleSaveRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/role/edit")
|
||||
@PostMapping("/admin/auth/role/edit")
|
||||
public BaseResponse edit(@RequestBody @Valid AuthRoleSaveRequest authRoleSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (authRoleSaveRequest.getId() == null) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
||||
}
|
||||
|
||||
// 检查是否存在当前角色
|
||||
AuthRole byName = authRoleService.findByName(authRoleSaveRequest.getName());
|
||||
if (byName != null && !authRoleSaveRequest.getId().equals(byName.getId())) {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前角色已存在");
|
||||
}
|
||||
|
||||
AuthRole authRole = new AuthRole();
|
||||
BeanUtils.copyProperties(authRoleSaveRequest, authRole);
|
||||
|
||||
boolean b = authRoleService.updateAuthRole(authRole);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param authRoleSaveRequest
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("admin/auth/role/delete")
|
||||
@PostMapping("/admin/auth/role/delete")
|
||||
public BaseResponse delete(@RequestBody AuthRoleSaveRequest authRoleSaveRequest) {
|
||||
|
||||
if (authRoleSaveRequest.getId() == null) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
||||
}
|
||||
|
||||
boolean b = authRoleService.deleteById(authRoleSaveRequest.getId());
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
//TODO 删除角色后先前授权的缓存不会消失
|
||||
|
||||
// 再删除之前的授权
|
||||
authPermissionService.deleteByRoleId(authRoleSaveRequest.getId());
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.glxp.udi.admin.controller.auth;
|
||||
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.auth.CustomerContactEntity;
|
||||
import com.glxp.udi.admin.req.auth.CustomerContactFilterRequest;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.auth.impl.CustomerContactService;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@Slf4j
|
||||
public class CustomerContactController {
|
||||
|
||||
@Resource
|
||||
private CustomerContactService customerContactService;
|
||||
|
||||
|
||||
@GetMapping("salewarehouse/customerContact/list")
|
||||
public BaseResponse filterList(CustomerContactFilterRequest customerFilterRequest) {
|
||||
List<CustomerContactEntity> customerContactEntityList = customerContactService.filterCustomerContact(customerFilterRequest);
|
||||
PageInfo<CustomerContactEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(customerContactEntityList);
|
||||
PageSimpleResponse<CustomerContactEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(customerContactEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("salewarehouse/customerContact/add")
|
||||
public BaseResponse addContact(CustomerContactEntity customerContactEntity) {
|
||||
|
||||
boolean b = customerContactService.insertCustomerContact(customerContactEntity);
|
||||
if (b)
|
||||
return ResultVOUtils.success("添加成功");
|
||||
else {
|
||||
return ResultVOUtils.error(500, "添加失败");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@GetMapping("salewarehouse/customerContact/delete")
|
||||
public BaseResponse deleteContact(DeleteRequest deleteRequest) {
|
||||
boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId()));
|
||||
if (b)
|
||||
return ResultVOUtils.success("删除成功");
|
||||
else {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,135 @@
|
||||
package com.glxp.udi.admin.controller.auth;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.auth.*;
|
||||
import com.glxp.udi.admin.req.auth.CustomerInfoFilterRequest;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.auth.AuthRoleAdminService;
|
||||
import com.glxp.udi.admin.service.auth.CustomerInfoService;
|
||||
import com.glxp.udi.admin.service.auth.UserRegisterService;
|
||||
import com.glxp.udi.admin.service.auth.impl.CustomerContactService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@Slf4j
|
||||
public class CustomerController {
|
||||
|
||||
@Resource
|
||||
private CustomerInfoService customerInfoService;
|
||||
@Resource
|
||||
private CustomerContactService customerContactService;
|
||||
@Resource
|
||||
private UserRegisterService userRegisterService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
@Resource
|
||||
private AuthRoleAdminService authRoleAdminService;
|
||||
|
||||
|
||||
@GetMapping("salewarehouse/customer/list")
|
||||
public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) {
|
||||
|
||||
List<CustomerDetailEntity> customerDetailEntities = customerInfoService.filterDetailCustomer(customerFilterRequest);
|
||||
PageInfo<CustomerDetailEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(customerDetailEntities);
|
||||
PageSimpleResponse<CustomerDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(customerDetailEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("salewarehouse/customer/detail")
|
||||
public BaseResponse customerDetail(CustomerInfoFilterRequest customerFilterRequest) {
|
||||
|
||||
CustomerDetailEntity customerDetailEntity = customerInfoService.selectDetail(customerFilterRequest.getCustomerId());
|
||||
if (customerDetailEntity != null) {
|
||||
return ResultVOUtils.success(customerDetailEntity);
|
||||
}
|
||||
return ResultVOUtils.error(500, "用户信息为空");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("salewarehouse/customer/update")
|
||||
public BaseResponse updateCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
|
||||
BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity);
|
||||
boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity);
|
||||
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 ) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
@PostMapping("salewarehouse/customer/modify")
|
||||
public BaseResponse modifyCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
|
||||
BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity);
|
||||
boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity);
|
||||
|
||||
CustomerContactEntity customerContactEntity = new CustomerContactEntity();
|
||||
BeanUtils.copyProperties(customerDetailEntity, customerContactEntity);
|
||||
boolean c = customerContactService.updateCustomerContact(customerContactEntity);
|
||||
if (!b ) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
@PostMapping("salewarehouse/customer/delete")
|
||||
public BaseResponse deleteCustomers(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
String id = deleteRequest.getId();
|
||||
customerInfoService.deleteById(Long.parseLong(id));
|
||||
customerContactService.deleteById(Long.parseLong(id));
|
||||
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++){
|
||||
authRoleAdminService.deleteByAdminId(authAdmins.get(i).getId());
|
||||
}
|
||||
}
|
||||
authAdminService.deleteByCustomerId(Long.parseLong(id));
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,174 @@
|
||||
package com.glxp.udi.admin.controller.auth;
|
||||
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.auth.AuthRoleAdmin;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.auth.LoginRequest;
|
||||
import com.glxp.udi.admin.req.auth.UpdatePasswordRequest;
|
||||
import com.glxp.udi.admin.res.auth.LoginUserInfoResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.auth.AuthLoginService;
|
||||
import com.glxp.udi.admin.service.auth.AuthRoleAdminService;
|
||||
import com.glxp.udi.admin.util.IpUtils;
|
||||
import com.glxp.udi.admin.util.JwtUtils;
|
||||
import com.glxp.udi.admin.util.PasswordUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* 登录相关
|
||||
*/
|
||||
@RestController
|
||||
@Slf4j
|
||||
public class LoginController {
|
||||
|
||||
@Autowired
|
||||
private AuthLoginService authLoginService;
|
||||
|
||||
@Autowired
|
||||
private AuthAdminService authAdminService;
|
||||
|
||||
@Resource
|
||||
private AuthRoleAdminService authRoleAdminService;
|
||||
|
||||
/**
|
||||
* 用户登录
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(value = "/login")
|
||||
public BaseResponse index(@RequestBody @Valid LoginRequest loginRequest,
|
||||
BindingResult bindingResult,
|
||||
HttpServletRequest request) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername());
|
||||
if (authAdmin == null) {
|
||||
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
|
||||
}
|
||||
|
||||
if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
|
||||
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
|
||||
}
|
||||
|
||||
if(authAdmin.getUserFlag() !=1){
|
||||
throw new JsonException(ResultEnum.DATA_NOT, "该用户账号已被禁用");
|
||||
}
|
||||
|
||||
// 更新登录状态
|
||||
AuthAdmin authAdminUp = new AuthAdmin();
|
||||
authAdminUp.setId(authAdmin.getId());
|
||||
authAdminUp.setLastLoginTime(new Date());
|
||||
authAdminUp.setLastLoginIp(IpUtils.getIpAddr(request));
|
||||
authAdminService.updateAuthAdmin(authAdminUp);
|
||||
|
||||
// 登录成功后获取权限，这里面会设置到缓存
|
||||
authLoginService.listRuleByAdminId(authAdmin.getId());
|
||||
|
||||
Map<String, Object> claims = new HashMap<>();
|
||||
claims.put("admin_id", authAdmin.getId());
|
||||
String token = JwtUtils.createToken(claims, 86400L); // 一天后过期
|
||||
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("id", authAdmin.getId());
|
||||
map.put("token", token);
|
||||
|
||||
return ResultVOUtils.success(map);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取登录用户信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/admin/auth/login/userInfo")
|
||||
public BaseResponse userInfo(HttpServletRequest request) {
|
||||
String adminId = request.getHeader("ADMIN_ID");
|
||||
Long id = Long.valueOf(adminId);
|
||||
|
||||
AuthAdmin authAdmin = authAdminService.findById(id);
|
||||
|
||||
List<String> authRules = authLoginService.listRuleByAdminId(authAdmin.getId());
|
||||
List<AuthRoleAdmin> authRoleAdminList = authRoleAdminService.listByAdminId(authAdmin.getId());
|
||||
LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
|
||||
if (authRoleAdminList != null && authRoleAdminList.size() > 0) {
|
||||
List<Long> roles = new ArrayList<>();
|
||||
for (int i = 0; i < authRoleAdminList.size(); i++) {
|
||||
roles.add(authRoleAdminList.get(i).getRole_id());
|
||||
}
|
||||
loginUserInfoResponse.setRoleIds(roles);
|
||||
}
|
||||
|
||||
BeanUtils.copyProperties(authAdmin, loginUserInfoResponse);
|
||||
loginUserInfoResponse.setAuthRules(authRules);
|
||||
|
||||
return ResultVOUtils.success(loginUserInfoResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* 登出
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/admin/auth/login/out")
|
||||
public BaseResponse out() {
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改密码
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串
|
||||
@PostMapping("/admin/auth/login/password")
|
||||
public BaseResponse password(@RequestBody @Valid UpdatePasswordRequest updatePasswordRequest,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL.getCode(),
|
||||
bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
AuthAdmin authAdmin = authAdminService.findById(updatePasswordRequest.getAdminId());
|
||||
if (authAdmin == null) {
|
||||
throw new JsonException(ResultEnum.DATA_NOT);
|
||||
}
|
||||
String oldPwd = PasswordUtils.authAdminPwd(updatePasswordRequest.getOldPassword());
|
||||
// 旧密码不对
|
||||
if (authAdmin.getPassWord() != null
|
||||
&& !authAdmin.getPassWord().equals(oldPwd)) {
|
||||
throw new JsonException(ResultEnum.DATA_NOT, "旧密码匹配失败");
|
||||
}
|
||||
|
||||
AuthAdmin authAdminUp = new AuthAdmin();
|
||||
authAdminUp.setId(authAdmin.getId());
|
||||
String newPwd = PasswordUtils.authAdminPwd(updatePasswordRequest.getNewPassword());
|
||||
authAdminUp.setPassWord(newPwd);
|
||||
|
||||
boolean b = authAdminService.updateAuthAdmin(authAdminUp);
|
||||
if (b) {
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
return ResultVOUtils.error(ResultEnum.DATA_CHANGE);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,309 @@
|
||||
package com.glxp.udi.admin.controller.device;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.dao.udid.DeviceMapper;
|
||||
import com.glxp.udi.admin.dao.udid.DevicedownloadMapper;
|
||||
import com.glxp.udi.admin.entity.udid.*;
|
||||
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.info.CompanyService;
|
||||
import com.glxp.udi.admin.service.inout.DeviceService;
|
||||
import com.glxp.udi.admin.service.inout.DruginfoService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class DeviceController {
|
||||
|
||||
@Resource
|
||||
DeviceMapper deviceMapper;
|
||||
@Resource
|
||||
DruginfoService druginfoService;
|
||||
|
||||
@Resource
|
||||
private DeviceService deviceService;
|
||||
@Resource
|
||||
private DevicedownloadMapper devicedownloadMapper;
|
||||
@Resource
|
||||
CompanyService companyService;
|
||||
|
||||
|
||||
@GetMapping("warehouse/device/list")
|
||||
public BaseResponse listDevices(@Valid DeviceListRequest deviceListRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
String key = deviceListRequest.getKey();
|
||||
boolean isScan = false;
|
||||
if (key != null && key.length() > 22) {
|
||||
key = key.substring(2, 16);
|
||||
deviceListRequest.setKey(key);
|
||||
isScan = true;
|
||||
}
|
||||
List<DeviceEntity> medicalResonseList = deviceService.listDevices(deviceListRequest);
|
||||
long total = 0;
|
||||
PageInfo<DeviceEntity> pageInfo = new PageInfo<>(medicalResonseList);
|
||||
PageSimpleResponse<DeviceEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
List<Devicedownload> devicedownloads = devicedownloadMapper.selectByExample(new DevicedownloadExample());
|
||||
Devicedownload devicedownload;
|
||||
if (devicedownloads != null && devicedownloads.size() > 0) {
|
||||
devicedownload = devicedownloads.get(0);
|
||||
total = devicedownload.getAlltotal() - devicedownload.getAllindex();
|
||||
}
|
||||
if (isScan) {
|
||||
total = 20;
|
||||
pageSimpleResponse.setTotal(total);
|
||||
} else
|
||||
pageSimpleResponse.setTotal(total * 10);
|
||||
pageSimpleResponse.setList(medicalResonseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/device/search")
|
||||
public BaseResponse searchByKey(@Valid DeviceListRequest deviceListRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
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;
|
||||
DeviceEntity deviceEntity = new DeviceEntity();
|
||||
if (device != null)
|
||||
BeanUtils.copyProperties(device, deviceEntity);
|
||||
PageSimpleResponse<DeviceEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(total);
|
||||
List<DeviceEntity> deviceEntityList = new ArrayList<>();
|
||||
deviceEntityList.add(deviceEntity);
|
||||
pageSimpleResponse.setList(deviceEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/device/searchbydi")
|
||||
public BaseResponse searchByDi(@Valid DeviceListRequest deviceListRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
String key = deviceListRequest.getKey();
|
||||
Device device = deviceService.searchByZxxscpbs(key);
|
||||
long total = 1;
|
||||
DeviceEntity deviceEntity = new DeviceEntity();
|
||||
if (device != null)
|
||||
BeanUtils.copyProperties(device, deviceEntity);
|
||||
PageSimpleResponse<DeviceEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(total);
|
||||
List<DeviceEntity> deviceEntityList = new ArrayList<>();
|
||||
deviceEntityList.add(deviceEntity);
|
||||
pageSimpleResponse.setList(deviceEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/device/unionSearch")
|
||||
public BaseResponse search(@Valid DeviceSearchRequest deviceSearchRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<DeviceEntity> medicalResonseList = deviceService.search(deviceSearchRequest);
|
||||
long total = deviceService.seatchTotal(deviceSearchRequest);
|
||||
PageSimpleResponse<DeviceEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(total);
|
||||
pageSimpleResponse.setList(medicalResonseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/device/combineSearch")
|
||||
public BaseResponse combineSearch(@Valid DeviceSearchRequest deviceSearchRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<DeviceEntity> medicalResonseList = deviceService.search(deviceSearchRequest);
|
||||
|
||||
long total = 0;
|
||||
PageSimpleResponse<DeviceEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
List<Devicedownload> devicedownloads = devicedownloadMapper.selectByExample(new DevicedownloadExample());
|
||||
Devicedownload devicedownload;
|
||||
if (devicedownloads != null && devicedownloads.size() > 0) {
|
||||
devicedownload = devicedownloads.get(0);
|
||||
total = devicedownload.getAlltotal() - devicedownload.getAllindex();
|
||||
}
|
||||
|
||||
for (int i = 0;i<medicalResonseList.size();i++){
|
||||
String nameCode = medicalResonseList.get(i).getZxxsdycpbs();
|
||||
if(druginfoService.isExit(nameCode)){
|
||||
medicalResonseList.get(i).setCheck(true);
|
||||
}else
|
||||
medicalResonseList.get(i).setCheck(false);
|
||||
}
|
||||
|
||||
pageSimpleResponse.setTotal(total * 10);
|
||||
pageSimpleResponse.setList(medicalResonseList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("warehouse/device/loadsingle")
|
||||
public BaseResponse downLoadDiii(@RequestBody DeviceDiRequest deviceRequest) {
|
||||
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService);
|
||||
if(deviceRequest.getPrimaryDeviceId() == null){
|
||||
return ResultVOUtils.error(999,"最小销售单元标识不能为空");
|
||||
}
|
||||
new Thread(() -> {
|
||||
|
||||
TokenEntity token = downloadDeviceHelper.getToken();
|
||||
DownloadDiRequest downloadDiRequest1 = new DownloadDiRequest();
|
||||
downloadDiRequest1.setAccessToken(token.getAccessToken());
|
||||
downloadDiRequest1.setPrimaryDeviceId(deviceRequest.getPrimaryDeviceId());
|
||||
int result = downloadDeviceHelper.downloadBydi( downloadDiRequest1,deviceService);
|
||||
if (result == -1) {
|
||||
return;// ResultVOUtils.error(505, "下载出错");
|
||||
}
|
||||
|
||||
}).start();
|
||||
return ResultVOUtils.success("开始下载");
|
||||
}
|
||||
|
||||
@PostMapping("warehouse/device/downLoadHisory")
|
||||
public BaseResponse downLoadHisory(@RequestBody DeviceDiRequest deviceRequest) {
|
||||
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService);
|
||||
if(deviceRequest.getPrimaryDeviceId() == null){
|
||||
return ResultVOUtils.error(999,"最小销售单元标识不能为空");
|
||||
}
|
||||
new Thread(() -> {
|
||||
String deviceRecordKey = deviceService.selectKey(deviceRequest.getPrimaryDeviceId());
|
||||
TokenEntity token = downloadDeviceHelper.getToken();
|
||||
DownloadHistoryRequest deviceHistoryRequest = new DownloadHistoryRequest();
|
||||
deviceHistoryRequest.setAccessToken(token.getAccessToken());
|
||||
deviceHistoryRequest.setCurrentPageNumber("1");
|
||||
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);
|
||||
if (result == -1) {
|
||||
return;// ResultVOUtils.error(505, "下载出错");
|
||||
}
|
||||
|
||||
}).start();
|
||||
return ResultVOUtils.success("开始下载");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("warehouse/device/loadudid")
|
||||
public BaseResponse downLoadAll(DownloadDeviceRequest downloadDeviceRequest, BindingResult bindingResult) {
|
||||
DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
new Thread(() -> {
|
||||
|
||||
TokenEntity token = downloadDeviceHelper.getToken();
|
||||
int total = downloadDeviceHelper.getTotal(token.getAccessToken());
|
||||
int curpage = total;
|
||||
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey("udid");
|
||||
if (devicedownload != null) {
|
||||
int offset = devicedownload.getAlltotal() - devicedownload.getAllindex();
|
||||
curpage = total - offset;
|
||||
} else {
|
||||
devicedownload= new Devicedownload();
|
||||
devicedownload.setId("udid");
|
||||
devicedownload.setAlltotal(100);
|
||||
devicedownload.setAllindex(99);
|
||||
devicedownloadMapper.insert(devicedownload);
|
||||
}
|
||||
devicedownload.setIsdownload(1);
|
||||
long startTime = System.currentTimeMillis();
|
||||
devicedownload.setStarttime(startTime + "");
|
||||
devicedownloadMapper.updateByPrimaryKey(devicedownload);
|
||||
Devicedownload stop = devicedownloadMapper.selectByPrimaryKey("udid");
|
||||
|
||||
while (curpage > 0 && stop.getIsdownload() == 1 && stop.getStarttime().equals(startTime + "")) {
|
||||
|
||||
DeviceRequest deviceRequest = new DeviceRequest();
|
||||
deviceRequest.setAccessToken(token.getAccessToken());
|
||||
deviceRequest.setRequestType(3 + "");
|
||||
deviceRequest.setCurrentPageNumber(curpage + "");
|
||||
int result = downloadDeviceHelper.downloadDevices(deviceService, deviceRequest);
|
||||
if (result == -1) {
|
||||
return;// ResultVOUtils.error(505, "下载出错");
|
||||
}
|
||||
curpage--;
|
||||
Devicedownload devicedownload1 = new Devicedownload();
|
||||
devicedownload1.setAlltotal(total);
|
||||
devicedownload1.setAllindex(curpage);
|
||||
devicedownload1.setId("udid");
|
||||
devicedownloadMapper.updateProgress(devicedownload1);
|
||||
stop = devicedownloadMapper.selectByPrimaryKey("udid");
|
||||
}
|
||||
}).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");
|
||||
devicedownload.setIsdownload(2);
|
||||
devicedownloadMapper.updateByPrimaryKey(devicedownload);
|
||||
return ResultVOUtils.success("停止成功");
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/device/progress")
|
||||
public BaseResponse getProgress() {
|
||||
Devicedownload devicedownload = devicedownloadMapper.selectByPrimaryKey("udid");
|
||||
ProgressResponse response = new ProgressResponse();
|
||||
if (devicedownload != null) {
|
||||
double index = devicedownload.getAlltotal() - devicedownload.getAllindex();
|
||||
double total = devicedownload.getAlltotal();
|
||||
double progress = 0;
|
||||
if (total > 0) {
|
||||
progress = index / total;
|
||||
}
|
||||
response.setTotal(total * 10);
|
||||
response.setIndex(index * 10);
|
||||
response.setProgress(progress * 100);
|
||||
} else {
|
||||
response.setTotal(100);
|
||||
response.setIndex(1);
|
||||
response.setProgress(1);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success(response);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package com.glxp.udi.admin.controller.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.CustomerContactEntity;
|
||||
import com.glxp.udi.admin.entity.info.CompanyEntity;
|
||||
import com.glxp.udi.admin.req.info.CompanyRequest;
|
||||
import com.glxp.udi.admin.service.auth.impl.CustomerContactService;
|
||||
import com.glxp.udi.admin.service.info.CompanyService;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
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 javax.annotation.Resource;
|
||||
|
||||
@RestController
|
||||
public class CompanyController {
|
||||
|
||||
@Resource
|
||||
private CompanyService companyService;
|
||||
@Resource
|
||||
CustomerContactService customerContactService;
|
||||
|
||||
@GetMapping("/warehouse/info/company")
|
||||
public BaseResponse getCompanyInfo(CompanyRequest companyRequest) {
|
||||
CompanyEntity companyEntity = companyService.findCompany(companyRequest.getCustomerId());
|
||||
if (companyEntity != null) {
|
||||
return ResultVOUtils.success(companyEntity);
|
||||
}
|
||||
return ResultVOUtils.error(500, "企业信息为空");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/info/modifyCompany")
|
||||
public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) {
|
||||
|
||||
boolean b = companyService.modifyCompany(companyEntity);
|
||||
CustomerContactEntity customerContactEntity = new CustomerContactEntity();
|
||||
customerContactEntity.setTel(companyEntity.getTel());
|
||||
customerContactEntity.setMobile(companyEntity.getMobile());
|
||||
customerContactEntity.setEmail(companyEntity.getEmail());
|
||||
customerContactEntity.setContacts(companyEntity.getContacts());
|
||||
customerContactEntity.setCustomerId(companyEntity.getCustomerId());
|
||||
customerContactService.updateCustomerContact(customerContactEntity);
|
||||
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,111 @@
|
||||
package com.glxp.udi.admin.controller.info;
|
||||
|
||||
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.EnterpriseCertEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.info.DeleteEnterpriseCertRequest;
|
||||
import com.glxp.udi.admin.req.info.FilterEnterpriseCertRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.info.EnterpriseCertService;
|
||||
import com.glxp.udi.admin.util.UuidUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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.List;
|
||||
|
||||
@RestController
|
||||
public class EnterpriseCertController {
|
||||
|
||||
@Resource
|
||||
private EnterpriseCertService enterpriseCertService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/enterprise/add")
|
||||
public BaseResponse addEnterpriseCert(@RequestBody @Valid EnterpriseCertEntity enterpriseCertEntity, 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));
|
||||
|
||||
enterpriseCertEntity.setUDI_RegistrationOID(UuidUtils.getUUId());
|
||||
enterpriseCertEntity.setUDI_Enterprise_FK(authAdmin.getCustomerId()+"");
|
||||
boolean b = enterpriseCertService.insertEnterpriseCert(enterpriseCertEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("添加失败");
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/enterprise/delete")
|
||||
public BaseResponse deleteEnterpriseCert(@RequestBody @Valid DeleteEnterpriseCertRequest deleteEnterpriseCertRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = enterpriseCertService.deleteEnterpriseCert(deleteEnterpriseCertRequest);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/enterprise/modify")
|
||||
public BaseResponse modifyEnterpriseCert(@RequestBody @Valid EnterpriseCertEntity enterpriseCertEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = enterpriseCertService.modifyEnterpriseCert(enterpriseCertEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("修改失败");
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/enterprise/list")
|
||||
public BaseResponse listEnterpriseCert(@Valid FilterEnterpriseCertRequest filterEnterpriseCertRequest, 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));
|
||||
// filterEnterpriseCertRequest.setCustomerId(authAdmin.getCustomerId()+""); //暂时取消
|
||||
List<EnterpriseCertEntity> enterpriseCertEntities = enterpriseCertService.filterEnterpriseCerts(filterEnterpriseCertRequest);
|
||||
PageInfo<EnterpriseCertEntity> pageInfo = new PageInfo<>(enterpriseCertEntities);
|
||||
PageSimpleResponse<EnterpriseCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(enterpriseCertEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,181 @@
|
||||
package com.glxp.udi.admin.controller.info;
|
||||
|
||||
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.FacidentcodeEntity;
|
||||
import com.glxp.udi.admin.entity.info.IdentifierEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.info.DeleteFacidentcodeRequest;
|
||||
import com.glxp.udi.admin.req.info.FilterFacidentcodeRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.basic.AllFCodeResponse;
|
||||
import com.glxp.udi.admin.res.basic.FacidentcodeResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.info.FacidentcodeService;
|
||||
import com.glxp.udi.admin.service.info.IdentifierService;
|
||||
import com.glxp.udi.admin.util.UuidUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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;
|
||||
|
||||
@RestController
|
||||
public class FacidentcodeController {
|
||||
|
||||
|
||||
@Resource
|
||||
private FacidentcodeService facidentcodeService;
|
||||
@Resource
|
||||
private IdentifierService identifierService;
|
||||
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/facidentcode/add")
|
||||
public BaseResponse addFacidentcode(@RequestBody @Valid FacidentcodeEntity facidentcodeEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
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 (facidentcodeEntity != null) {
|
||||
facidentcodeEntity.setUDI_FacIdentCodeOID(UuidUtils.getUUId());
|
||||
facidentcodeEntity.setUDI_Customer_FK(authAdmin.getCustomerId() + "");
|
||||
}
|
||||
|
||||
boolean b = facidentcodeService.insertFacidentcode(facidentcodeEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("添加失败");
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/facidentcode/delete")
|
||||
public BaseResponse deleteFacidentcode(@RequestBody @Valid DeleteFacidentcodeRequest deleteFacidentcodeRequest, BindingResult bindingResult) {
|
||||
|
||||
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, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/facidentcode/modify")
|
||||
public BaseResponse modifyFacidentcode(@RequestBody @Valid FacidentcodeEntity facidentcodeEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = facidentcodeService.modifyFacidentcode(facidentcodeEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("修改失败");
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/facidentcode/list")
|
||||
public BaseResponse listFacidentcode(FilterFacidentcodeRequest filterFacidentcodeRequest) {
|
||||
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));
|
||||
filterFacidentcodeRequest.setCustomerId(authAdmin.getCustomerId() + "");
|
||||
List<FacidentcodeResponse> facidentcodeEntities = facidentcodeService.selectByCustomerId(filterFacidentcodeRequest);
|
||||
PageInfo<FacidentcodeResponse> pageInfo = new PageInfo<>(facidentcodeEntities);
|
||||
PageSimpleResponse<FacidentcodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(facidentcodeEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
//生成项目码
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/facidentcode/generate")
|
||||
public BaseResponse generateIdentify(@RequestBody @Valid FacidentcodeEntity facidentcodeEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
int count = Integer.parseInt(facidentcodeEntity.getNoDigit());
|
||||
int max = (int) Math.pow(10, count);
|
||||
String serNum = null;
|
||||
List<IdentifierEntity> identifierEntities = new ArrayList<>();
|
||||
for (int i = 1; i < max; i++) {
|
||||
serNum = String.format("%0" + count + "d", i);
|
||||
IdentifierEntity identifierEntity = new IdentifierEntity();
|
||||
identifierEntity.setSeqNumber(serNum);
|
||||
identifierEntity.setUDI_IdentifierOID(UuidUtils.getUUId());
|
||||
identifierEntity.setIdentifierCode(facidentcodeEntity.getIndentCode() + serNum);
|
||||
identifierEntity.setUDI_FacIdentCode_FK(facidentcodeEntity.getUDI_FacIdentCodeOID());
|
||||
identifierEntity.setIsGTIN("0");
|
||||
identifierEntity.setIsReg("0");
|
||||
identifierEntity.setIsSPTM("0");
|
||||
identifierEntity.setIsUDI("0");
|
||||
identifierEntities.add(identifierEntity);
|
||||
}
|
||||
boolean b = identifierService.insertIdentifierList(identifierEntities);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("生成失败");
|
||||
return ResultVOUtils.success("生成成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/facidentcode/all")
|
||||
public BaseResponse listFacidentcode() {
|
||||
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));
|
||||
List<String> facidentcodeEntities = facidentcodeService.selectAll(authAdmin.getCustomerId() + "");
|
||||
List<AllFCodeResponse> allFCodeResponses = new ArrayList<>();
|
||||
if (facidentcodeEntities != null && facidentcodeEntities.size() > 0) {
|
||||
for (String str : facidentcodeEntities) {
|
||||
AllFCodeResponse allFCodeResponse = new AllFCodeResponse();
|
||||
allFCodeResponse.setLabel(str);
|
||||
allFCodeResponse.setValue(str);
|
||||
allFCodeResponses.add(allFCodeResponse);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success(allFCodeResponses);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
package com.glxp.udi.admin.controller.info;
|
||||
|
||||
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.req.info.DeleteIdentifierRequest;
|
||||
import com.glxp.udi.admin.req.info.FilterIdentifierRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.info.IdentifierService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
//产商识别码
|
||||
@RestController
|
||||
public class IdentifyCodeController {
|
||||
|
||||
@Resource
|
||||
private IdentifierService identifierService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/identifier/add")
|
||||
public BaseResponse addIdentifier(@RequestBody @Valid IdentifierEntity identifierEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = identifierService.insertIdentifier(identifierEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("添加失败");
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/identifier/delete")
|
||||
public BaseResponse deleteIdentifier(@RequestBody @Valid DeleteIdentifierRequest deleteIdentifierRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = identifierService.deleteIdentifier(deleteIdentifierRequest);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/identifier/modify")
|
||||
public BaseResponse modifyIdentifier(@RequestBody @Valid IdentifierEntity identifierEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = identifierService.modifyIdentifier(identifierEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("修改失败");
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/identifier/list")
|
||||
public BaseResponse listIdentifier(@Valid FilterIdentifierRequest filterIdentifierRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<IdentifierEntity> identifierEntities = identifierService.selectByfacident(filterIdentifierRequest);
|
||||
PageInfo<IdentifierEntity> pageInfo = new PageInfo<>(identifierEntities);
|
||||
PageSimpleResponse<IdentifierEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(identifierEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
//随机获取标识
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/identifier/random")
|
||||
public BaseResponse randomIdentifier(@Valid FilterIdentifierRequest filterIdentifierRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String code = identifierService.randomCode(filterIdentifierRequest);
|
||||
return ResultVOUtils.success(code);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
package com.glxp.udi.admin.controller.info;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.info.StandagencyEntity;
|
||||
import com.glxp.udi.admin.req.info.DeleteStandagencyRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.info.StandagencyService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class StandagencyController {
|
||||
|
||||
@Resource
|
||||
private StandagencyService standagencyService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/standagency/add")
|
||||
public BaseResponse addstandagency(@RequestBody @Valid StandagencyEntity standagencyEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = standagencyService.insertStandagency(standagencyEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("添加失败");
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/standagency/delete")
|
||||
public BaseResponse deletestandagency(@RequestBody @Valid DeleteStandagencyRequest deletestandagencyRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = standagencyService.deleteStandagency(deletestandagencyRequest);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/standagency/modify")
|
||||
public BaseResponse modifystandagency(@RequestBody @Valid StandagencyEntity standagencyEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = standagencyService.modifyStandagency(standagencyEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("修改失败");
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/standagency/list")
|
||||
public BaseResponse liststandagency() {
|
||||
List<StandagencyEntity> standagencyEntities = standagencyService.selectAll();
|
||||
PageInfo<StandagencyEntity> pageInfo = new PageInfo<>(standagencyEntities);
|
||||
PageSimpleResponse<StandagencyEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(standagencyEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,183 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
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.contrast.CodeContrastDetailEntity;
|
||||
import com.glxp.udi.admin.entity.contrast.CodeContrastEntity;
|
||||
import com.glxp.udi.admin.entity.contrast.CustomercontrastEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import com.glxp.udi.admin.req.contrast.CodeContrastRequest;
|
||||
import com.glxp.udi.admin.req.contrast.DeleteCustomerContrastRequest;
|
||||
import com.glxp.udi.admin.req.contrast.FilterCodeContrastRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.contrast.CodeContrastResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.contrast.CodeContrastService;
|
||||
import com.glxp.udi.admin.service.contrast.CustomercontrastService;
|
||||
import com.glxp.udi.admin.util.UuidUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class CodeContrastController {
|
||||
|
||||
@Resource
|
||||
private CodeContrastService codeContrastService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
@Resource
|
||||
private CustomercontrastService customercontrastService;
|
||||
|
||||
//对照码上传
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/salewarehouse/codeContrast/save")
|
||||
public BaseResponse saveList(@RequestBody @Valid CodeContrastRequest codeContrastRequest, 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));
|
||||
|
||||
List<CodeContrastEntity> codeContrastEntities = codeContrastRequest.getCodeContrastData();
|
||||
List<CodeContrastEntity> insertData = new ArrayList<>();
|
||||
|
||||
List<CustomercontrastEntity> customercontrastEntities = new ArrayList<>(); //创建关联关系
|
||||
|
||||
if (codeContrastEntities != null && codeContrastEntities.size() > 0) {
|
||||
|
||||
for (int i = 0; i < codeContrastEntities.size(); i++) {
|
||||
|
||||
String uuid = UuidUtils.getUUId();
|
||||
|
||||
CodeContrastEntity codeContrastEntity = codeContrastEntities.get(i);
|
||||
codeContrastEntity.setUserId(Long.parseLong(userId));
|
||||
codeContrastEntity.setCustomerId(authAdmin.getCustomerId());
|
||||
codeContrastEntity.setId(uuid);
|
||||
insertData.add(codeContrastEntity);
|
||||
|
||||
CustomercontrastEntity customercontrastEntity = new CustomercontrastEntity();
|
||||
customercontrastEntity.setCodeContrastId(uuid);
|
||||
customercontrastEntity.setCustomerId(authAdmin.getCustomerId());
|
||||
customercontrastEntity.setUserId(Long.parseLong(userId));
|
||||
customercontrastEntities.add(customercontrastEntity);
|
||||
}
|
||||
} else return ResultVOUtils.error(301, "上传对照数据为空");
|
||||
|
||||
boolean b = codeContrastService.insertCodeContrastList(insertData);
|
||||
boolean c = customercontrastService.insertCustomercontrastList(customercontrastEntities); //插入对照表
|
||||
if (!b && !c) {
|
||||
return ResultVOUtils.error(500, "插入数据出错");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/salewarehouse/codeContrast/deleteContrastByCustomer")
|
||||
public BaseResponse deleteCustomerContrast(@RequestBody @Valid DeleteCustomerContrastRequest deleteCustomerContrastRequest, 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));
|
||||
deleteCustomerContrastRequest.setCustomerId(authAdmin.getCustomerId());
|
||||
boolean b = customercontrastService.deleteCustomercontrast(deleteCustomerContrastRequest);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
//对照码下载
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/salewarehouse/codeContrast/list")
|
||||
public BaseResponse listCodeContrast(@Valid ListPageRequest listPageRequest, 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));
|
||||
List<CodeContrastEntity> codeContrastEntities = codeContrastService.listCodeContrast(listPageRequest, authAdmin.getCustomerId());
|
||||
|
||||
List<CodeContrastResponse> codeContrastResponses = codeContrastEntities.stream().map(item ->
|
||||
{
|
||||
CodeContrastResponse codeContrastResponse = new CodeContrastResponse();
|
||||
BeanUtils.copyProperties(item, codeContrastResponse);
|
||||
return codeContrastResponse;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<CodeContrastResponse> pageInfo = new PageInfo<>(codeContrastResponses);
|
||||
PageSimpleResponse<CodeContrastResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(codeContrastResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
//对照表查询
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/salewarehouse/codeContrast/filter")
|
||||
public BaseResponse filterCodeContrast(@Valid FilterCodeContrastRequest filterCodeContrastRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<CodeContrastDetailEntity> codeContrastEntities = null;
|
||||
if (filterCodeContrastRequest.getCustomerId() != null)
|
||||
codeContrastEntities = customercontrastService.filterDetailByCustomerId(filterCodeContrastRequest);
|
||||
else {
|
||||
codeContrastEntities = customercontrastService.filterDetailAll(filterCodeContrastRequest);
|
||||
}
|
||||
|
||||
List<CodeContrastDetailEntity> codeContrastResponses = codeContrastEntities.stream().map(item ->
|
||||
{
|
||||
CodeContrastDetailEntity codeContrastDetailEntity = new CodeContrastDetailEntity();
|
||||
BeanUtils.copyProperties(item, codeContrastDetailEntity);
|
||||
return codeContrastDetailEntity;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<CodeContrastDetailEntity> pageInfo = new PageInfo<>(codeContrastResponses);
|
||||
PageSimpleResponse<CodeContrastDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(codeContrastResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,231 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Druginfo;
|
||||
import com.glxp.udi.admin.entity.inout.MipsDrugEntity;
|
||||
import com.glxp.udi.admin.req.inout.DrugFilterRequest;
|
||||
import com.glxp.udi.admin.req.inout.DrugInfoRequest;
|
||||
import com.glxp.udi.admin.req.inout.DrugsSaveRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.inout.DruginfoResponse;
|
||||
import com.glxp.udi.admin.res.inout.MipsDrugResponse;
|
||||
import com.glxp.udi.admin.service.info.CompanyService;
|
||||
import com.glxp.udi.admin.service.inout.DruginfoService;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 药品信息
|
||||
*/
|
||||
@RestController
|
||||
public class DruginfoController {
|
||||
|
||||
|
||||
@Resource
|
||||
private DruginfoService druginfoService;
|
||||
@Resource
|
||||
private CompanyService companyService;
|
||||
|
||||
@Value("${UDIC_MIPSDOWNLOAD_URL}")
|
||||
private String url;
|
||||
|
||||
@GetMapping("warehouse/drug/list")
|
||||
public BaseResponse list(@Valid DrugInfoRequest drugInfoRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<Druginfo> druginfoList = druginfoService.listDrugInfo(drugInfoRequest);
|
||||
List<DruginfoResponse> druginfoResponses = druginfoList.stream().map(item ->
|
||||
{
|
||||
DruginfoResponse druginfoResponse = new DruginfoResponse();
|
||||
BeanUtils.copyProperties(item, druginfoResponse);
|
||||
return druginfoResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<Druginfo> pageInfo = new PageInfo<>(druginfoList);
|
||||
PageSimpleResponse<DruginfoResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(druginfoResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/drug/filter")
|
||||
public BaseResponse filter(@Valid DrugFilterRequest drugFilterRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<Druginfo> druginfoList = druginfoService.filterDrugInfo(drugFilterRequest);
|
||||
|
||||
List<DruginfoResponse> druginfoResponses = druginfoList.stream().map(item ->
|
||||
{
|
||||
DruginfoResponse druginfoResponse = new DruginfoResponse();
|
||||
BeanUtils.copyProperties(item, druginfoResponse);
|
||||
return druginfoResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<Druginfo> pageInfo = new PageInfo<>(druginfoList);
|
||||
PageSimpleResponse<DruginfoResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(druginfoResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取同一种类型的产品信息并合并后返回
|
||||
*
|
||||
* @param drugInfoRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("warehouse/drug/combineFilter")
|
||||
public BaseResponse combineFilter(@Valid DrugFilterRequest drugInfoRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<Druginfo> druginfoList = druginfoService.filterDrugInfo(drugInfoRequest);
|
||||
Map<String, Druginfo> data = new HashMap<>();
|
||||
for (Druginfo druginfo : druginfoList) {
|
||||
data.put(druginfo.getUuid(), druginfo);
|
||||
}
|
||||
List<Druginfo> returnLists = new ArrayList<>();
|
||||
for (Druginfo value : data.values()) {
|
||||
returnLists.add(value);
|
||||
}
|
||||
for (int i = 0; i < returnLists.size(); i++) {
|
||||
String nameCode = returnLists.get(i).getNamecode();
|
||||
if (druginfoService.isExit(nameCode)) {
|
||||
returnLists.get(i).setCheck(true);
|
||||
} else
|
||||
returnLists.get(i).setCheck(false);
|
||||
}
|
||||
|
||||
|
||||
List<DruginfoResponse> druginfoResponses = returnLists.stream().map(item ->
|
||||
{
|
||||
DruginfoResponse druginfoResponse = new DruginfoResponse();
|
||||
BeanUtils.copyProperties(item, druginfoResponse);
|
||||
return druginfoResponse;
|
||||
}).collect(Collectors.toList());
|
||||
PageInfo<Druginfo> pageInfo = new PageInfo<>(druginfoList);
|
||||
PageSimpleResponse<DruginfoResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(druginfoResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入TXT药品信息
|
||||
*
|
||||
* @param drugsSaveRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/warehouse/drug/save")
|
||||
public BaseResponse saveList(@RequestBody @Valid DrugsSaveRequest drugsSaveRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<Druginfo> druginfos = drugsSaveRequest.getDruginfos();
|
||||
List<Druginfo> saveList = addUuid(druginfos);
|
||||
drugsSaveRequest.setDruginfos(saveList);
|
||||
int b = druginfoService.saveDruginfo(drugsSaveRequest);
|
||||
System.out.println(b + "-------------------");
|
||||
if (b < 0) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
public List<Druginfo> addUuid(List<Druginfo> druginfos){
|
||||
Map<String, List<Druginfo>> data = new HashMap<>();
|
||||
for (Druginfo druginfo : druginfos) {
|
||||
String key = druginfo.getConame() + druginfo.getFormspec() + druginfo.getPackspec() + druginfo.getPackratio();
|
||||
if (data.get(key) == null) {
|
||||
List<Druginfo> values = new ArrayList<>();
|
||||
values.add(druginfo);
|
||||
data.put(key, values);
|
||||
} else {
|
||||
List<Druginfo> values = data.get(key);
|
||||
values.add(druginfo);
|
||||
}
|
||||
|
||||
}
|
||||
List<Druginfo> saveList = new ArrayList<>();
|
||||
for (List<Druginfo> druginfoList : data.values()) {
|
||||
String uuid = getUUId();
|
||||
for (int i = 0; i < druginfoList.size(); i++) {
|
||||
Druginfo druginfo = druginfoList.get(i);
|
||||
druginfo.setUuid(uuid);
|
||||
saveList.add(druginfo);
|
||||
}
|
||||
}
|
||||
return saveList;
|
||||
}
|
||||
|
||||
private String getUUId() {
|
||||
UUID uuid = UUID.randomUUID();
|
||||
return uuid.toString().replace("-", "");
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/drug/import")
|
||||
public BaseResponse importMips() {
|
||||
String response = HttpClient.mipsGet(url + "/mips/druginfo/list");
|
||||
MipsDrugResponse mipsDrugResponse = (MipsDrugResponse) JSONObject.parseObject(response, MipsDrugResponse.class);
|
||||
if (mipsDrugResponse.getCode() == 20000) {
|
||||
// CompanyEntity companyEntity = companyService.findCompany();
|
||||
List<MipsDrugEntity> mipsDrugEntities = mipsDrugResponse.getData().getList();
|
||||
List<Druginfo> druginfoResponses = mipsDrugEntities.stream().map(item ->
|
||||
{
|
||||
Druginfo druginfo = new Druginfo();
|
||||
BeanUtils.copyProperties(item, druginfo);
|
||||
druginfo.setNamecode(item.getCodeVersion() + item.getResCode());
|
||||
if ("1".equals(item.getProductType())) {
|
||||
druginfo.setType("监管药品");
|
||||
} else if ("2".equals(item.getProductType())) {
|
||||
druginfo.setType("非国家监管药品");
|
||||
}
|
||||
|
||||
druginfo.setConame(item.getProductName());
|
||||
druginfo.setAuthcode(item.getAuthorizedNo());
|
||||
druginfo.setForm(item.getType());
|
||||
druginfo.setFormspec(item.getSpec());
|
||||
druginfo.setPackspec(item.getPackageSpec());
|
||||
druginfo.setPackratio(item.getPkgRatio());
|
||||
druginfo.setPacklevel(item.getCodeLevel());
|
||||
// druginfo.setUnit(companyEntity.getName());
|
||||
return druginfo;
|
||||
}).collect(Collectors.toList());
|
||||
List<Druginfo> saveList = addUuid(druginfoResponses);
|
||||
DrugsSaveRequest drugsSaveRequest = new DrugsSaveRequest();
|
||||
drugsSaveRequest.setDruginfos(saveList);
|
||||
int b = druginfoService.saveDruginfo(drugsSaveRequest);
|
||||
System.out.println(b + "-------------------");
|
||||
if (b < 0) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success("导入成功");
|
||||
} else {
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,194 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.OrderEntity;
|
||||
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
|
||||
import com.glxp.udi.admin.req.inout.*;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.OrderService;
|
||||
import com.glxp.udi.admin.service.inout.WarehouseService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class OrderController {
|
||||
|
||||
@Resource
|
||||
private OrderService orderService;
|
||||
@Resource
|
||||
private WarehouseService warehouseService;
|
||||
|
||||
|
||||
@GetMapping("admin/warehouse/inout/order/list")
|
||||
public BaseResponse list(OrderQueryRequest orderQueryRequest) {
|
||||
List<OrderEntity> orderEntityList = orderService.listOrders(orderQueryRequest);
|
||||
PageInfo<OrderEntity> pageInfo;
|
||||
String data;
|
||||
pageInfo = new PageInfo<>(orderEntityList);
|
||||
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(orderEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("admin/warehouse/inout/order/listerror")
|
||||
public BaseResponse listOrderError(OrderQueryRequest orderQueryRequest) {
|
||||
List<OrderEntity> orderEntityList = orderService.listOrderError(orderQueryRequest);
|
||||
PageInfo<OrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(orderEntityList);
|
||||
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(orderEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("admin/warehouse/inout/order/listRepeat")
|
||||
public BaseResponse listOrderRepeat(OrderQueryRequest orderQueryRequest) {
|
||||
List<OrderEntity> orderEntityList = orderService.listOrderRepeat(orderQueryRequest);
|
||||
PageInfo<OrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(orderEntityList);
|
||||
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(orderEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("admin/warehouse/inout/order/save")
|
||||
public BaseResponse save(@RequestBody @Valid OrderEntity orderSaveRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
OrderEntity orderEntity = new OrderEntity();
|
||||
BeanUtils.copyProperties(orderSaveRequest, orderEntity);
|
||||
|
||||
boolean b = orderService.insertOrder(orderEntity);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/inout/order/mergeOrder")
|
||||
public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<String> orderList = orderMergeRequest.getOrderList();
|
||||
if (orderList != null && orderList.size() > 1) {
|
||||
String mainOrder = orderList.get(0);
|
||||
for (int i = 1; i < orderList.size(); i++) {
|
||||
warehouseService.updateOrderId(orderList.get(i), mainOrder);
|
||||
orderService.deleteByOrderId(orderList.get(i));
|
||||
}
|
||||
} else {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
|
||||
}
|
||||
return ResultVOUtils.success("合并成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("warehouse/inout/order/deleteOrder")
|
||||
public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
orderService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/inout/order/unit")
|
||||
public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
boolean b = orderService.updateUnit(orderEntity);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
b = warehouseService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp());
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/inout/order/updateExportStatus")
|
||||
public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = orderService.updateExportStatus(updateExportStatusRequest.getOrderId(), updateExportStatusRequest.getExportStatus());
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
@GetMapping("/warehouse/inout/order/filter")
|
||||
public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<OrderEntity> orderEntityList;
|
||||
if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
|
||||
List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(orderFilterRequest.getCode());
|
||||
orderEntityList = orderService.filterListByCode(warehouseEntityList);
|
||||
} else {
|
||||
orderEntityList = orderService.filterList(orderFilterRequest);
|
||||
}
|
||||
|
||||
PageInfo<OrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(orderEntityList);
|
||||
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(orderEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/warehouse/inout/order/filterCode")
|
||||
public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(orderFilterByCodeRequest.getCode());
|
||||
List<OrderEntity> orderEntityList = orderService.filterListByCode(warehouseEntityList);
|
||||
PageInfo<OrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(orderEntityList);
|
||||
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(orderEntityList);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Unit;
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import com.glxp.udi.admin.req.inout.UnitKeyRequest;
|
||||
import com.glxp.udi.admin.req.inout.UnitSaveRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.UnitService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class UnitController {
|
||||
|
||||
@Resource
|
||||
UnitService unitService;
|
||||
|
||||
|
||||
@GetMapping("warehouse/unit/list")
|
||||
public BaseResponse listUnits(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<Unit> units = unitService.listUnit(listPageRequest);
|
||||
PageInfo<Unit> pageInfo = new PageInfo<>(units);
|
||||
PageSimpleResponse<Unit> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(units);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("warehouse/unit/list/key")
|
||||
public BaseResponse listUnitsByKey(@Valid UnitKeyRequest keyRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
List<Unit> units = unitService.listUnitKey(keyRequest);
|
||||
PageInfo<Unit> pageInfo = new PageInfo<>(units);
|
||||
PageSimpleResponse<Unit> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(units);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/unit/save")
|
||||
public BaseResponse saveList(@RequestBody @Valid UnitSaveRequest unitSaveRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
unitService.deletAll();
|
||||
int b = unitService.saveUnits(unitSaveRequest);
|
||||
System.out.println(b + "-------------------");
|
||||
if (b < 0) {
|
||||
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
package com.glxp.udi.admin.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.entity.contrast.WhitecodeEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.ListPageRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.contrast.WhitecodeResponse;
|
||||
import com.glxp.udi.admin.service.contrast.WhitecodeService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
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.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
public class WhitecodeController {
|
||||
@Resource
|
||||
WhitecodeService whitecodeService;
|
||||
|
||||
//白名单下载
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/salewarehouse/whitecode/list")
|
||||
public BaseResponse listWhitecode(@Valid ListPageRequest listPageRequest, 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));
|
||||
List<WhitecodeEntity> whitecodeEntities = whitecodeService.findAll(listPageRequest);
|
||||
List<WhitecodeResponse> whitecodeResponses = whitecodeEntities.stream().map(item ->
|
||||
{
|
||||
WhitecodeResponse whitecodeResponse = new WhitecodeResponse();
|
||||
BeanUtils.copyProperties(item, whitecodeResponse);
|
||||
return whitecodeResponse;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
PageInfo<WhitecodeResponse> pageInfo = new PageInfo<>(whitecodeResponses);
|
||||
PageSimpleResponse<WhitecodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(whitecodeResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,260 @@
|
||||
package com.glxp.udi.admin.controller.publish;
|
||||
|
||||
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.udi.admin.controller.device.DownloadDeviceHelper;
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.info.CompanyEntity;
|
||||
import com.glxp.udi.admin.entity.publish.*;
|
||||
import com.glxp.udi.admin.entity.udid.TokenEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.publish.PostIdentifyKeyRequest;
|
||||
import com.glxp.udi.admin.req.publish.PostIdentifyRequest;
|
||||
import com.glxp.udi.admin.res.publish.PostSaveResponse;
|
||||
import com.glxp.udi.admin.res.publish.UdiDeviceIdResponse;
|
||||
import com.glxp.udi.admin.service.auth.AuthAdminService;
|
||||
import com.glxp.udi.admin.service.info.CompanyService;
|
||||
import com.glxp.udi.admin.service.publish.*;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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;
|
||||
|
||||
@RestController
|
||||
public class PostIdentifyController {
|
||||
|
||||
@Resource
|
||||
CompanyService companyService;
|
||||
@Resource
|
||||
AuthAdminService authAdminService;
|
||||
@Resource
|
||||
UdiDeviceIdService udiDeviceIdService;
|
||||
@Resource
|
||||
UdiDeviceCliService udiDeviceCliService;
|
||||
@Resource
|
||||
UdiDevicepkService udiDevicepkService;
|
||||
@Resource
|
||||
UdiDeviceSrgService udiDeviceSrgService;
|
||||
@Resource
|
||||
UdiProductService udiProductService;
|
||||
|
||||
//草稿上传
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/postIdentify/add")
|
||||
public BaseResponse add(@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);
|
||||
// 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);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
public PostIdentifyEntity buildPost(PostIdentifyRequest postIdentifyRequest, String token) {
|
||||
PostIdentifyEntity postIdentifyEntity = new PostIdentifyEntity();
|
||||
postIdentifyEntity.setAccessToken(token);
|
||||
List<PostDataBean> dataSetBeans = new ArrayList<>();
|
||||
List<String> ids = postIdentifyRequest.getIds();
|
||||
List<UdiDeviceIdResponse> udiDeviceIdResponses = udiDeviceIdService.selectByByIds(ids);
|
||||
|
||||
for (int i = 0; i < udiDeviceIdResponses.size(); i++) {
|
||||
|
||||
UdiDeviceIdResponse udiDeviceIdResponse = udiDeviceIdResponses.get(i);
|
||||
PostDataBean dataSetBean = new PostDataBean();
|
||||
UdiProductEntity udiProductEntity = udiProductService.selectById(udiDeviceIdResponse.getUDI_Product_FK());
|
||||
dataSetBean.setUploadType("add");
|
||||
dataSetBean.setCPMCTYMC(udiProductEntity.getProductName());
|
||||
dataSetBean.setDeviceRecordKey(udiDeviceIdResponse.getDeviceRecordKey());
|
||||
dataSetBean.setZXXSDYCPBS(udiDeviceIdResponse.getPrimaryDeviceId());
|
||||
dataSetBean.setZXXSDYZSYDYDSL(udiDeviceIdResponse.getPkgQuantity());
|
||||
if (udiDeviceIdResponse.getUseUnitDeviceId() == null)
|
||||
dataSetBean.setSYDYCPBS("");
|
||||
else
|
||||
dataSetBean.setSYDYCPBS(udiDeviceIdResponse.getUseUnitDeviceId());
|
||||
dataSetBean.setCPBSBMTXMC(udiDeviceIdResponse.getIssuingAgency());
|
||||
if (udiDeviceIdResponse.getIsDirectMark().equals("2")) {
|
||||
dataSetBean.setSFYBTZJBS("0");
|
||||
} else dataSetBean.setSFYBTZJBS("1");
|
||||
|
||||
dataSetBean.setBTCPBSYZXXSDYCPBSSFYZ(udiDeviceIdResponse.getIsSameDeviceId());
|
||||
dataSetBean.setBTCPBS(udiDeviceIdResponse.getDirectMarkDI());
|
||||
if (udiDeviceIdResponse.getDeviceCarrier() != null) {
|
||||
String data = udiDeviceIdResponse.getDeviceCarrier().replace(";", ",");
|
||||
dataSetBean.setBSZT(data);//
|
||||
}
|
||||
|
||||
dataSetBean.setSFYZCBAYZ(udiDeviceIdResponse.getIsSameRegDI());
|
||||
dataSetBean.setZCBACPBS(udiDeviceIdResponse.getRegistrationDI());
|
||||
dataSetBean.setCPBSFBRQ(udiDeviceIdResponse.getPublishDate());
|
||||
// dataSetBean.setCPMCTYMC(udiDeviceIdResponse.getProductName());
|
||||
dataSetBean.setSPMC(udiDeviceIdResponse.getBrandName());
|
||||
dataSetBean.setGGXH(udiDeviceIdResponse.getSpecification());
|
||||
if (udiDeviceIdResponse.getDeviceKit() != null && udiDeviceIdResponse.getDeviceKit().equals("2")) {
|
||||
dataSetBean.setSFWBLZTLCP("0");
|
||||
} else
|
||||
dataSetBean.setSFWBLZTLCP("1");
|
||||
|
||||
dataSetBean.setCPMS(udiDeviceIdResponse.getDeviceDescription());
|
||||
dataSetBean.setCPHHHBH(udiDeviceIdResponse.getCatalogNumber());
|
||||
if (udiDeviceIdResponse.getProductType() != null && udiDeviceIdResponse.getProductType().equals("体外诊断试剂"))
|
||||
dataSetBean.setCPLX("2");
|
||||
else
|
||||
dataSetBean.setCPLX("1");
|
||||
dataSetBean.setFLBM(udiDeviceIdResponse.getProductCode());
|
||||
dataSetBean.setYFLBM(udiDeviceIdResponse.getProductOldCode());
|
||||
dataSetBean.setYLQXZCRBARMC(udiDeviceIdResponse.getCompanyName());
|
||||
dataSetBean.setYLQXZCRBARYWMC(udiDeviceIdResponse.getCompanyGBName());
|
||||
dataSetBean.setTYSHXYDM(udiDeviceIdResponse.getBusinessLicense());
|
||||
dataSetBean.setZCZBHHZBAPZBH(udiDeviceIdResponse.getRegcardCodes());
|
||||
if (udiDeviceIdResponse.getProductType() != null && udiDeviceIdResponse.getProductType().equals("耗材"))
|
||||
dataSetBean.setHCHZSB("0");
|
||||
else dataSetBean.setHCHZSB("1");
|
||||
dataSetBean.setSFBJWYCXSY(udiDeviceIdResponse.getSingleUse());
|
||||
dataSetBean.setZDCFSYCS(udiDeviceIdResponse.getReuseTimes());
|
||||
|
||||
|
||||
if (udiDeviceIdResponse.getIsDeviceSterile() != null && udiDeviceIdResponse.getIsDeviceSterile().equals("1"))
|
||||
dataSetBean.setSFWWJBZ("1");
|
||||
else dataSetBean.setSFWWJBZ("0");
|
||||
dataSetBean.setSYQSFXYJXMJ(udiDeviceIdResponse.getIsSterilizationUse());
|
||||
dataSetBean.setMJFS(udiDeviceIdResponse.getSterilizationMethod());
|
||||
dataSetBean.setYBBM(udiDeviceIdResponse.getYBBM());
|
||||
if (udiDeviceIdResponse.getMRISafetyInfo() == null)
|
||||
dataSetBean.setCGZMRAQXGXX("3");
|
||||
else
|
||||
dataSetBean.setCGZMRAQXGXX(udiDeviceIdResponse.getMRISafetyInfo());
|
||||
dataSetBean.setTSCCHCZTJ(udiDeviceIdResponse.getSpecialText());
|
||||
dataSetBean.setTSCCSM(udiDeviceIdResponse.getClinicalSizeText());
|
||||
dataSetBean.setSCBSSFBHPH(udiDeviceIdResponse.getIsLotBatch());
|
||||
dataSetBean.setSCBSSFBHXLH(udiDeviceIdResponse.getIsSerialNumber());
|
||||
dataSetBean.setSCBSSFBHSCRQ(udiDeviceIdResponse.getIsManufacturingDate());
|
||||
if (udiDeviceIdResponse.getIsExpirationDate() != null && udiDeviceIdResponse.getIsExpirationDate().equals("2"))
|
||||
dataSetBean.setSCBSSFBHSXRQ("0");
|
||||
else dataSetBean.setSCBSSFBHSXRQ("1");
|
||||
|
||||
dataSetBean.setQTXXDWZLJ(udiDeviceIdResponse.getOtherInfoLink());
|
||||
|
||||
List<PostDeviceClinicalBean> deviceClinicalBeans = new ArrayList<>();
|
||||
List<UdiDeviceCliEntity> udiDeviceCliEntities = udiDeviceCliService.selectBySubProductId(udiDeviceIdResponse.getUDI_SubProduct_FK());
|
||||
if (udiDeviceCliEntities != null && udiDeviceCliEntities.size() > 0) {
|
||||
for (UdiDeviceCliEntity udiDeviceCliEntity : udiDeviceCliEntities) {
|
||||
PostDeviceClinicalBean deviceClinicalBean = new PostDeviceClinicalBean();
|
||||
deviceClinicalBean.setCCDW(udiDeviceCliEntity.getCCDW());
|
||||
deviceClinicalBean.setLCSYCCLX(udiDeviceCliEntity.getLCSYCCLX());
|
||||
deviceClinicalBean.setCCZ(udiDeviceCliEntity.getCCZ());
|
||||
deviceClinicalBeans.add(deviceClinicalBean);
|
||||
|
||||
}
|
||||
}
|
||||
List<PostDevicePackageBean> devicePackageBeans = new ArrayList<>();
|
||||
List<UdiDevicepkEntity> udiDevicepkEntities = udiDevicepkService.selectByDeviceId(udiDeviceIdResponse.getUDI_DeviceIdOID());
|
||||
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
|
||||
for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) {
|
||||
PostDevicePackageBean devicePackageBean = new PostDevicePackageBean();
|
||||
devicePackageBean.setBZCPBS(udiDevicepkEntity.getPkgDeviceId());
|
||||
devicePackageBean.setBZNHXYJBZCPBS(udiDevicepkEntity.getContainsDIPackage());
|
||||
devicePackageBean.setBZNHXYJCPBSSL(udiDevicepkEntity.getPkgQuantity());
|
||||
devicePackageBean.setCPBZJB(udiDevicepkEntity.getPkgType());
|
||||
devicePackageBeans.add(devicePackageBean);
|
||||
}
|
||||
}
|
||||
List<PostDeviceStorageBean> deviceStorageBeans = new ArrayList<>();
|
||||
List<UdiDeviceSrgEntity> udiDeviceSrgEntities = udiDeviceSrgService.selectBySubProduct(udiDeviceIdResponse.getUDI_SubProduct_FK());
|
||||
if (udiDeviceSrgEntities != null && udiDeviceSrgEntities.size() > 0) {
|
||||
for (UdiDeviceSrgEntity udiDeviceSrgEntity : udiDeviceSrgEntities) {
|
||||
PostDeviceStorageBean deviceStorageBean = new PostDeviceStorageBean();
|
||||
deviceStorageBean.setCCHCZTJ(udiDeviceSrgEntity.getStorageType());
|
||||
deviceStorageBean.setZDZ(udiDeviceSrgEntity.getLowValue());
|
||||
deviceStorageBean.setZGZ(udiDeviceSrgEntity.getHighValue());
|
||||
deviceStorageBean.setJLDW(udiDeviceSrgEntity.getUnit());
|
||||
deviceStorageBeans.add(deviceStorageBean);
|
||||
}
|
||||
}
|
||||
dataSetBean.setTSRQ(udiDeviceIdResponse.getDeviceEndDate());
|
||||
// dataSetBean.setBGSM(udiDeviceIdResponse);
|
||||
dataSetBean.setDevicePackage(devicePackageBeans);
|
||||
dataSetBean.setDeviceStorage(deviceStorageBeans);
|
||||
dataSetBean.setDeviceClinical(deviceClinicalBeans);
|
||||
dataSetBeans.add(dataSetBean);
|
||||
postIdentifyEntity.setDataSet(dataSetBeans);
|
||||
}
|
||||
|
||||
return postIdentifyEntity;
|
||||
}
|
||||
|
||||
|
||||
//提交标识
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/postIdentify/upload")
|
||||
public BaseResponse postUpload(@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<>();
|
||||
for (UdiDeviceIdResponse udiDeviceIdResponse : udiDeviceIdResponses) {
|
||||
|
||||
PostIdentifyKeyRequest.DataSetBean dataSetBean = new PostIdentifyKeyRequest.DataSetBean();
|
||||
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("2");
|
||||
udiDeviceIdService.postUpdate(successListBean);
|
||||
}
|
||||
}else
|
||||
return ResultVOUtils.error(500,"提交失败");
|
||||
}else {
|
||||
return ResultVOUtils.error(500,"上传数据为空");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.glxp.udi.admin.controller.publish;
|
||||
|
||||
import com.glxp.udi.admin.dao.publish.ProductClassifyDao;
|
||||
import com.glxp.udi.admin.entity.publish.ProductClassifyEntity;
|
||||
import com.glxp.udi.admin.req.publish.ProductclassifyRequest;
|
||||
import com.glxp.udi.admin.res.publish.ProductClassifyResponse;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@RestController
|
||||
public class ProductClassifyController {
|
||||
|
||||
@Resource
|
||||
ProductClassifyDao productClassifyDao;
|
||||
|
||||
// @AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/subProduct/productclassify")
|
||||
public BaseResponse listClassify( @Valid ProductclassifyRequest productclassifyRequest, BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ProductClassifyResponse> options = new ArrayList<>();
|
||||
if (productclassifyRequest.getQXLB().equals("器械")) {
|
||||
List<ProductClassifyEntity> levelList1 = productClassifyDao.selectAll(new ProductclassifyRequest("1", "器械"));
|
||||
List<ProductClassifyEntity> levelList2 = productClassifyDao.selectAll(new ProductclassifyRequest("2", "器械"));
|
||||
List<ProductClassifyEntity> levelList3 = productClassifyDao.selectAll(new ProductclassifyRequest("3", "器械"));
|
||||
for (int i = 0; i < levelList1.size(); i++) {
|
||||
ProductClassifyEntity productClassifyEntity = levelList1.get(i);
|
||||
ProductClassifyResponse productClassifyResponse = new ProductClassifyResponse();
|
||||
productClassifyResponse.setLabel(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.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.setValue(leve3Pce.getId());
|
||||
l3productClassifyResponses.add(lv3Res);
|
||||
}
|
||||
}
|
||||
lv2Res.setChildren(l3productClassifyResponses);
|
||||
l2productClassifyResponses.add(lv2Res);
|
||||
}
|
||||
}
|
||||
productClassifyResponse.setChildren(l2productClassifyResponses);
|
||||
options.add(productClassifyResponse);
|
||||
}
|
||||
} else if (productclassifyRequest.getQXLB().equals("体外诊断试剂")) {
|
||||
List<ProductClassifyEntity> levelList1 = productClassifyDao.selectAll(new ProductclassifyRequest("1", "体外诊断试剂"));
|
||||
List<ProductClassifyEntity> levelList2 = productClassifyDao.selectAll(new ProductclassifyRequest("2", "体外诊断试剂"));
|
||||
for (int i = 0; i < levelList1.size(); i++) {
|
||||
ProductClassifyEntity productClassifyEntity = levelList1.get(i);
|
||||
ProductClassifyResponse productClassifyResponse = new ProductClassifyResponse();
|
||||
productClassifyResponse.setLabel(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.setValue(leve2Pce.getId());
|
||||
l2productClassifyResponses.add(lv2Res);
|
||||
}
|
||||
}
|
||||
productClassifyResponse.setChildren(l2productClassifyResponses);
|
||||
options.add(productClassifyResponse);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success(options);
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,194 @@
|
||||
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.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.publish.UdiDeviceCliService;
|
||||
import com.glxp.udi.admin.service.publish.UdiDeviceSrgService;
|
||||
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;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class SubUdiProductController {
|
||||
|
||||
@Resource
|
||||
private UdiSubProductService udiSubProductService;
|
||||
@Resource
|
||||
private UdiDeviceCliService udiDeviceCliService;
|
||||
@Resource
|
||||
private UdiDeviceSrgService udiDeviceSrgService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/subProduct/add")
|
||||
public BaseResponse add(@RequestBody @Valid AddSubProductRequest addSubProductRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
UdiSubProductEntity udiSubProductEntity = addSubProductRequest.getUdiSubProductEntity();
|
||||
|
||||
String productId = UuidUtils.getUUId();
|
||||
|
||||
if (udiSubProductEntity != null) {
|
||||
udiSubProductEntity.setUDI_SubProductOID(productId);
|
||||
udiSubProductService.insertUdiSubProduct(udiSubProductEntity);
|
||||
} else return ResultVOUtils.success("添加失败");
|
||||
List<UdiDeviceCliEntity> udiDeviceCliEntities = addSubProductRequest.getUdiDeviceCliEntities();
|
||||
List<UdiDeviceCliEntity> insertClis = new ArrayList<>();
|
||||
|
||||
if (udiDeviceCliEntities != null && udiDeviceCliEntities.size() > 0) {
|
||||
for (UdiDeviceCliEntity udiDeviceCliEntity : udiDeviceCliEntities) {
|
||||
udiDeviceCliEntity.setUDI_DeviceCliOID(UuidUtils.getUUId());
|
||||
udiDeviceCliEntity.setUDI_SubProduct_FK(productId);
|
||||
insertClis.add(udiDeviceCliEntity);
|
||||
}
|
||||
udiDeviceCliService.insertUdiDeviceCliList(insertClis);
|
||||
}
|
||||
List<UdiDeviceSrgEntity> udiDeviceSrgEntities = addSubProductRequest.getUdiDeviceSrgEntities();
|
||||
List<UdiDeviceSrgEntity> insertSrgs = new ArrayList<>();
|
||||
if (udiDeviceSrgEntities != null && udiDeviceSrgEntities.size() > 0) {
|
||||
for (UdiDeviceSrgEntity udiDeviceSrgEntity : udiDeviceSrgEntities) {
|
||||
udiDeviceSrgEntity.setUDI_DeviceSrgOID(UuidUtils.getUUId());
|
||||
udiDeviceSrgEntity.setUDI_SubProduct_FK(productId);
|
||||
insertSrgs.add(udiDeviceSrgEntity);
|
||||
}
|
||||
udiDeviceSrgService.insertUdiDeviceSrgList(insertSrgs);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/subProduct/modify")
|
||||
public BaseResponse modify(@RequestBody @Valid AddSubProductRequest addSubProductRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
UdiSubProductEntity udiSubProductEntity = addSubProductRequest.getUdiSubProductEntity();
|
||||
|
||||
|
||||
if (udiSubProductEntity != null) {
|
||||
udiSubProductService.modifyUdiSubProduct(udiSubProductEntity);
|
||||
} else return ResultVOUtils.success("修改失败");
|
||||
List<UdiDeviceCliEntity> udiDeviceCliEntities = addSubProductRequest.getUdiDeviceCliEntities();
|
||||
List<UdiDeviceCliEntity> insertClis = new ArrayList<>();
|
||||
|
||||
if (udiDeviceCliEntities != null && udiDeviceCliEntities.size() > 0) {
|
||||
for (UdiDeviceCliEntity udiDeviceCliEntity : udiDeviceCliEntities) {
|
||||
if (udiDeviceCliEntity.getUDI_DeviceCliOID() == null || udiDeviceCliEntity.getUDI_DeviceCliOID().equals("")) {
|
||||
udiDeviceCliEntity.setUDI_DeviceCliOID(UuidUtils.getUUId());
|
||||
udiDeviceCliEntity.setUDI_SubProduct_FK(udiSubProductEntity.getUDI_SubProductOID());
|
||||
}
|
||||
if (udiDeviceCliEntity.getIsDelete() != 1)
|
||||
insertClis.add(udiDeviceCliEntity);
|
||||
else {
|
||||
DeleteUdiDeviceCliRequest deleteUdiDeviceCliRequest = new DeleteUdiDeviceCliRequest();
|
||||
deleteUdiDeviceCliRequest.setId(udiDeviceCliEntity.getUDI_DeviceCliOID());
|
||||
udiDeviceCliService.deleteUdiDeviceCli(deleteUdiDeviceCliRequest);
|
||||
}
|
||||
}
|
||||
udiDeviceCliService.insertUdiDeviceCliList(insertClis);
|
||||
}
|
||||
List<UdiDeviceSrgEntity> udiDeviceSrgEntities = addSubProductRequest.getUdiDeviceSrgEntities();
|
||||
List<UdiDeviceSrgEntity> insertSrgs = new ArrayList<>();
|
||||
if (udiDeviceSrgEntities != null && udiDeviceSrgEntities.size() > 0) {
|
||||
for (UdiDeviceSrgEntity udiDeviceSrgEntity : udiDeviceSrgEntities) {
|
||||
if (udiDeviceSrgEntity.getUDI_DeviceSrgOID() == null || udiDeviceSrgEntity.getUDI_DeviceSrgOID().equals("")) {
|
||||
udiDeviceSrgEntity.setUDI_DeviceSrgOID(UuidUtils.getUUId());
|
||||
udiDeviceSrgEntity.setUDI_SubProduct_FK(udiSubProductEntity.getUDI_SubProductOID());
|
||||
}
|
||||
if (udiDeviceSrgEntity.getIsDelete() != 1)
|
||||
insertSrgs.add(udiDeviceSrgEntity);
|
||||
else {
|
||||
DeleteUdiDeviceSrgRequest deleteUdiDeviceSrgRequest = new DeleteUdiDeviceSrgRequest();
|
||||
deleteUdiDeviceSrgRequest.setId(udiDeviceSrgEntity.getUDI_DeviceSrgOID());
|
||||
udiDeviceSrgService.deleteUdiDeviceSrg(deleteUdiDeviceSrgRequest);
|
||||
}
|
||||
|
||||
}
|
||||
udiDeviceSrgService.insertUdiDeviceSrgList(insertSrgs);
|
||||
}
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/subProduct/delete")
|
||||
public BaseResponse deleteSubProduct(@RequestBody @Valid DeleteUdiSubProductRequest
|
||||
deleteUdiProductRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = udiSubProductService.deleteUdiSubProduct(deleteUdiProductRequest);
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/subProduct/list")
|
||||
public BaseResponse listSubProduct(@Valid FilterUdiSubProductRequest filterUdiSubProductRequest, BindingResult
|
||||
bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
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());
|
||||
pageSimpleResponse.setList(udiProductEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/subProduct/cliList")
|
||||
public BaseResponse listCli(@Valid FilterCliRequest filterCliRequest, BindingResult
|
||||
bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UdiDeviceCliEntity> udiDeviceCliEntities = udiDeviceCliService.selectBySubProductId(filterCliRequest.getSubProductId());
|
||||
return ResultVOUtils.success(udiDeviceCliEntities);
|
||||
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/subProduct/srgList")
|
||||
public BaseResponse listSrg(@Valid FilterCliRequest filterCliRequest, BindingResult
|
||||
bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UdiDeviceSrgEntity> udiDeviceSrgEntities = udiDeviceSrgService.selectBySubProduct(filterCliRequest.getSubProductId());
|
||||
return ResultVOUtils.success(udiDeviceSrgEntities);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,170 @@
|
||||
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.publish.UdiDeviceIdEntity;
|
||||
import com.glxp.udi.admin.entity.publish.UdiDevicepkEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
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.publish.UdiDeviceIdService;
|
||||
import com.glxp.udi.admin.service.publish.UdiDevicepkService;
|
||||
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;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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;
|
||||
|
||||
//产品标识
|
||||
|
||||
@RestController
|
||||
public class UdiDeviceIdController {
|
||||
|
||||
@Resource
|
||||
private UdiSubProductService udiSubProductService;
|
||||
@Resource
|
||||
private UdiDeviceIdService udiDeviceIdService;
|
||||
@Resource
|
||||
private UdiDevicepkService udiDevicepkService;
|
||||
@Resource
|
||||
AuthAdminService authAdminService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/deviceId/add")
|
||||
public BaseResponse add(@RequestBody @Valid AddUdiDeviceIdRequest addUdiDeviceIdRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
UdiDeviceIdEntity udiDeviceIdEntity = addUdiDeviceIdRequest.getUdiDeviceIdEntity();
|
||||
|
||||
String productId = UuidUtils.getUUId();
|
||||
|
||||
if (udiDeviceIdEntity != null) {
|
||||
udiDeviceIdEntity.setUDI_DeviceIdOID(productId);
|
||||
udiDeviceIdService.insertUdiDeviceId(udiDeviceIdEntity);
|
||||
} else return ResultVOUtils.success("添加失败");
|
||||
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
|
||||
List<UdiDevicepkEntity> insertPkgs = new ArrayList<>();
|
||||
|
||||
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
|
||||
for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) {
|
||||
udiDevicepkEntity.setUDI_DevicePkgOID(UuidUtils.getUUId());
|
||||
udiDevicepkEntity.setUDI_DeviceId_FK(productId);
|
||||
insertPkgs.add(udiDevicepkEntity);
|
||||
}
|
||||
udiDevicepkService.insertUdiDevicepkList(insertPkgs);
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/deviceId/delete")
|
||||
public BaseResponse deleteDeviceId(@RequestBody @Valid DeleteUdiDeviceIdRequest deleteUdiProductRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = udiDeviceIdService.deleteUdiDeviceId(deleteUdiProductRequest);
|
||||
//删除关联数据
|
||||
//toDo
|
||||
|
||||
if (!b) {
|
||||
return ResultVOUtils.error(500, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/deviceId/modify")
|
||||
public BaseResponse modify(@RequestBody @Valid AddUdiDeviceIdRequest addUdiDeviceIdRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
UdiDeviceIdEntity udiDeviceIdEntity = addUdiDeviceIdRequest.getUdiDeviceIdEntity();
|
||||
|
||||
|
||||
if (udiDeviceIdEntity != null) {
|
||||
udiDeviceIdService.modifyUdiDeviceId(udiDeviceIdEntity);
|
||||
} else return ResultVOUtils.success("修改失败");
|
||||
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
|
||||
List<UdiDevicepkEntity> insertPkgs = new ArrayList<>();
|
||||
|
||||
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
|
||||
for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) {
|
||||
if (udiDevicepkEntity.getUDI_DevicePkgOID() == null || udiDevicepkEntity.getUDI_DevicePkgOID().equals("")) {
|
||||
udiDevicepkEntity.setUDI_DevicePkgOID(UuidUtils.getUUId());
|
||||
udiDevicepkEntity.setUDI_DeviceId_FK(udiDeviceIdEntity.getUDI_DeviceIdOID());
|
||||
}
|
||||
if (udiDevicepkEntity.getIsDelete() != 1)
|
||||
insertPkgs.add(udiDevicepkEntity);
|
||||
else {
|
||||
DeleteUdiDevicepkRequest deleteUdiDevicepkRequest = new DeleteUdiDevicepkRequest();
|
||||
deleteUdiDevicepkRequest.setId(udiDevicepkEntity.getUDI_DevicePkgOID());
|
||||
udiDevicepkService.deleteUdiDevicepk(deleteUdiDevicepkRequest);
|
||||
}
|
||||
}
|
||||
udiDevicepkService.insertUdiDevicepkList(insertPkgs);
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/deviceId/list")
|
||||
public BaseResponse listDeviceId(@Valid FilterDeviceIdRequest filterDeviceIdRequest, 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));
|
||||
filterDeviceIdRequest.setCustomerId(authAdmin.getCustomerId()+"");
|
||||
List<UdiDeviceIdResponse> udiDeviceIdEntities = udiDeviceIdService.selectByProductId(filterDeviceIdRequest);
|
||||
|
||||
PageInfo<UdiDeviceIdResponse> pageInfo = new PageInfo<>(udiDeviceIdEntities);
|
||||
PageSimpleResponse<UdiDeviceIdResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(udiDeviceIdEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/deviceId/pkgList")
|
||||
public BaseResponse listPkg(@Valid FilterPkgRequest filterPkgRequest, BindingResult
|
||||
bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UdiDevicepkEntity> udiDevicepkEntities = udiDevicepkService.selectByDeviceId(filterPkgRequest.getDeviceId());
|
||||
return ResultVOUtils.success(udiDevicepkEntities);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,150 @@
|
||||
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.publish.UdiProductEntity;
|
||||
import com.glxp.udi.admin.exception.JsonException;
|
||||
import com.glxp.udi.admin.req.publish.DeleteUdiProductRequest;
|
||||
import com.glxp.udi.admin.req.publish.FilterUdiProductRequest;
|
||||
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.util.UuidUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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;
|
||||
|
||||
@RestController
|
||||
public class UdiProductController {
|
||||
@Resource
|
||||
private UdiProductService udiProductService;
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/product/add")
|
||||
public BaseResponse add(@RequestBody @Valid UdiProductEntity udiProductEntity, 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));
|
||||
udiProductEntity.setUDI_Customer_FK(authAdmin.getCustomerId() + "");
|
||||
udiProductEntity.setUDI_ProductOID(UuidUtils.getUUId());
|
||||
boolean b = udiProductService.insertUdiProduct(udiProductEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("添加失败");
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@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);
|
||||
}
|
||||
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, "删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udims/product/modify")
|
||||
public BaseResponse modify(@RequestBody @Valid UdiProductEntity udiProductEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = udiProductService.modifyUdiProduct(udiProductEntity);
|
||||
if (!b)
|
||||
return ResultVOUtils.success("修改失败");
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/product/list")
|
||||
public BaseResponse listUdiProduct(@Valid FilterUdiProductRequest filterUdiProductRequest, 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));
|
||||
filterUdiProductRequest.setCustomerId(authAdmin.getCustomerId() + "");
|
||||
List<UdiProductEntity> udiProductEntities = udiProductService.filterAll(filterUdiProductRequest);
|
||||
|
||||
PageInfo<UdiProductEntity> pageInfo = new PageInfo<>(udiProductEntities);
|
||||
PageSimpleResponse<UdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(udiProductEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/udims/product/all")
|
||||
public BaseResponse selectAll() {
|
||||
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));
|
||||
List<UdiProductEntity> udiProductEntities = udiProductService.selectByCustomerId(authAdmin.getCustomerId() );
|
||||
|
||||
List<UdiProductResponse> udiProductResponses = new ArrayList<>();
|
||||
if(udiProductEntities!=null && udiProductEntities.size()>0){
|
||||
for(UdiProductEntity udiProductEntity:udiProductEntities){
|
||||
UdiProductResponse udiProductResponse = new UdiProductResponse();
|
||||
udiProductResponse.setLabel(udiProductEntity.getProductName());
|
||||
udiProductResponse.setValue(udiProductEntity.getUDI_ProductOID());
|
||||
udiProductResponses.add(udiProductResponse);
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success(udiProductResponses);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.constant.BussinessTypeUtils;
|
||||
import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.receipts.BussinessTypeService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 业务类型维护
|
||||
*/
|
||||
|
||||
@RestController
|
||||
public class BussinessTypeController {
|
||||
|
||||
|
||||
@Resource
|
||||
private BussinessTypeService bussinessTypeService;
|
||||
|
||||
|
||||
@GetMapping("/warehouse/bussinessType/filter")
|
||||
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<BussinessTypeEntity> bussinessTypeEntities;
|
||||
|
||||
Map<String, String> data = BussinessTypeUtils.getBusssinessTypeMap();
|
||||
String type = data.getOrDefault(bussinessTypeFilterRequest.getUdiwmsType(), bussinessTypeFilterRequest.getUdiwmsType());
|
||||
bussinessTypeFilterRequest.setUdiwmsType(type);
|
||||
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
|
||||
PageInfo<BussinessTypeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(bussinessTypeEntities);
|
||||
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(bussinessTypeEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/bussinessType/delete")
|
||||
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
bussinessTypeService.deleteById(id);
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/bussinessType/update")
|
||||
public BaseResponse updateBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (bussinessTypeEntity != null) {
|
||||
bussinessTypeService.updateBussinessType(bussinessTypeEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/bussinessType/insert")
|
||||
public BaseResponse insertBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (bussinessTypeEntity != null) {
|
||||
bussinessTypeService.insertBussinessType(bussinessTypeEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Druginfo;
|
||||
import com.glxp.udi.admin.entity.receipt.ManuOrderEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ManuorderFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.inout.MipsManuorderResponse;
|
||||
import com.glxp.udi.admin.res.receipt.SelectManuorderResponse;
|
||||
import com.glxp.udi.admin.service.inout.DruginfoService;
|
||||
import com.glxp.udi.admin.service.receipts.ManuorderService;
|
||||
import com.glxp.udi.admin.service.receipts.ProductService;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
public class ManuOrderController {
|
||||
@Resource
|
||||
private ManuorderService manuorderService;
|
||||
@Resource
|
||||
private DruginfoService druginfoService;
|
||||
|
||||
@Resource
|
||||
private ProductService productService;
|
||||
|
||||
@Value("${UDIC_MIPSDOWNLOAD_URL}")
|
||||
private String url;
|
||||
|
||||
@GetMapping("/warehouse/manuorder/filter")
|
||||
public BaseResponse filterReceipt(ManuorderFilterRequest manuorderFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ManuOrderEntity> manuOrderEntities;
|
||||
|
||||
manuOrderEntities = manuorderService.filterList(manuorderFilterRequest);
|
||||
|
||||
PageInfo<ManuOrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(manuOrderEntities);
|
||||
PageSimpleResponse<ManuOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(manuOrderEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("warehouse/manuorder/import")
|
||||
public BaseResponse importManuorder(ManuorderFilterRequest manuorderFilterRequest) {
|
||||
Map<String, Object> paramMap = new HashMap<>(16);
|
||||
paramMap.put("page", manuorderFilterRequest.getPage());
|
||||
paramMap.put("limit", manuorderFilterRequest.getLimit());
|
||||
paramMap.put("BatchNo", manuorderFilterRequest.getBatchNo());
|
||||
paramMap.put("startTime", manuorderFilterRequest.getStartTime());
|
||||
paramMap.put("endTime", manuorderFilterRequest.getEndTime());
|
||||
String response = HttpClient.mipsGet(url + "/mips/manuorder/filter", paramMap);
|
||||
MipsManuorderResponse mipsManuorderResponse;
|
||||
try {
|
||||
mipsManuorderResponse = (MipsManuorderResponse) JSONObject.parseObject(response, MipsManuorderResponse.class);
|
||||
} catch (Exception e) {
|
||||
return ResultVOUtils.error(911, "连接mips服务出错");
|
||||
}
|
||||
if (mipsManuorderResponse.getCode() == 20000) {
|
||||
List<ManuOrderEntity> mipsDrugEntities = mipsManuorderResponse.getData().getList();
|
||||
if (mipsDrugEntities != null) {
|
||||
List<SelectManuorderResponse> selectManuorderResponses = new ArrayList<>();
|
||||
for (ManuOrderEntity manuOrderEntity : mipsDrugEntities) {
|
||||
Druginfo druginfo = druginfoService.selectByNamecode(manuOrderEntity.getCodeNum());
|
||||
SelectManuorderResponse selectManuorderResponse = new SelectManuorderResponse();
|
||||
selectManuorderResponse.setBatchNo(manuOrderEntity.getBatchNo());
|
||||
selectManuorderResponse.setCloseFlag(manuOrderEntity.getCloseFlag());
|
||||
selectManuorderResponse.setCodeNum(manuOrderEntity.getCodeNum());
|
||||
selectManuorderResponse.setComments(manuOrderEntity.getComments());
|
||||
selectManuorderResponse.setDrugProductionDate(manuOrderEntity.getDrugProductionDate());
|
||||
selectManuorderResponse.setDrugShelfLifeToDate(manuOrderEntity.getDrugShelfLifeToDate());
|
||||
selectManuorderResponse.setLastModifyTime(manuOrderEntity.getLastModifyTime());
|
||||
selectManuorderResponse.setName(druginfo.getConame());
|
||||
selectManuorderResponse.setOrderNo(manuOrderEntity.getOrderNo());
|
||||
selectManuorderResponse.setOrderQty(manuOrderEntity.getOrderQty());
|
||||
selectManuorderResponse.setPackRatio(druginfo.getPackratio());
|
||||
selectManuorderResponse.setSpec(druginfo.getPackspec());
|
||||
if (productService.isExit(manuOrderEntity.getOrderNo()))
|
||||
selectManuorderResponse.setIsUpdate("是");
|
||||
else
|
||||
selectManuorderResponse.setIsUpdate("否");
|
||||
selectManuorderResponse.setUuid(druginfo.getUuid());
|
||||
selectManuorderResponse.setOrderID(manuOrderEntity.getID() + "");
|
||||
selectManuorderResponses.add(selectManuorderResponse);
|
||||
}
|
||||
PageInfo<SelectManuorderResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(selectManuorderResponses);
|
||||
PageSimpleResponse<SelectManuorderResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(selectManuorderResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
} else {
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/manuorder/delete")
|
||||
public BaseResponse deleteProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
manuorderService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity;
|
||||
import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.receipts.MipsBarcodeService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class MipsBarcodeController {
|
||||
|
||||
@Resource
|
||||
private MipsBarcodeService mipsBarcodeService;
|
||||
|
||||
|
||||
@GetMapping("/warehouse/barcodes/filter")
|
||||
public BaseResponse filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<MipsBarcodeEntity> manuOrderEntities;
|
||||
|
||||
manuOrderEntities = mipsBarcodeService.filterBarcodes(mipsBarcodeRequest);
|
||||
|
||||
PageInfo<MipsBarcodeEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(manuOrderEntities);
|
||||
PageSimpleResponse<MipsBarcodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(manuOrderEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,248 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.ProductOrderEntity;
|
||||
import com.glxp.udi.admin.entity.udid.UdiEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.AddProductRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ProductFilterRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ProductMipsRequest;
|
||||
import com.glxp.udi.admin.req.udid.VerifyCodeRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.res.receipt.MipsBarcodeResponse;
|
||||
import com.glxp.udi.admin.res.receipt.SelectManuorderResponse;
|
||||
import com.glxp.udi.admin.service.receipts.MipsBarcodeService;
|
||||
import com.glxp.udi.admin.service.receipts.ProductService;
|
||||
import com.glxp.udi.admin.util.FilterUdiUtils;
|
||||
import com.glxp.udi.admin.util.HttpClient;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 生产订单
|
||||
*/
|
||||
@RestController
|
||||
public class ProductController {
|
||||
|
||||
|
||||
@Resource
|
||||
private ProductService productService;
|
||||
@Resource
|
||||
private MipsBarcodeService mipsBarcodeService;
|
||||
@Value("${UDIC_MIPSDOWNLOAD_URL}")
|
||||
private String url;
|
||||
|
||||
/**
|
||||
* 生产订单搜索
|
||||
*
|
||||
* @param productFilterRequest
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/warehouse/product/filter")
|
||||
public BaseResponse filterReceipt(ProductFilterRequest productFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ProductOrderEntity> productOrderEntities;
|
||||
|
||||
productOrderEntities = productService.filterList(productFilterRequest);
|
||||
|
||||
PageInfo<ProductOrderEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(productOrderEntities);
|
||||
PageSimpleResponse<ProductOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(productOrderEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/delete")
|
||||
public BaseResponse deleteProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
productService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/update")
|
||||
public BaseResponse updateProduct(@RequestBody ProductOrderEntity productOrderEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (productOrderEntity != null) {
|
||||
productService.updateProduct(productOrderEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/insert")
|
||||
public BaseResponse insertProduct(@RequestBody AddProductRequest addProductRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (addProductRequest != null) {
|
||||
productService.insertProduct(addProductRequest);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@PostMapping("/warehouse/product/insertmips")
|
||||
public BaseResponse insertMips(@RequestBody ProductMipsRequest productMipsRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (productMipsRequest != null) {
|
||||
List<SelectManuorderResponse> selectManuorderResponses = productMipsRequest.getSelectManuorderResponseList();
|
||||
if (selectManuorderResponses != null && selectManuorderResponses.size() > 0) {
|
||||
List<ProductOrderEntity> productOrderEntities = new ArrayList<>();
|
||||
|
||||
for (SelectManuorderResponse selectManuorderResponse : selectManuorderResponses) {
|
||||
ProductOrderEntity productOrderEntity = new ProductOrderEntity();
|
||||
productOrderEntity.setCount(selectManuorderResponse.getOrderQty());
|
||||
productOrderEntity.setBatchNo(selectManuorderResponse.getBatchNo());
|
||||
productOrderEntity.setCloseFlag(Integer.parseInt(selectManuorderResponse.getCloseFlag()));
|
||||
productOrderEntity.setComments(selectManuorderResponse.getComments());
|
||||
productOrderEntity.setExpirationDate(selectManuorderResponse.getDrugShelfLifeToDate());
|
||||
productOrderEntity.setOrderNo(selectManuorderResponse.getOrderNo());
|
||||
productOrderEntity.setManufacturingDate(selectManuorderResponse.getDrugProductionDate());
|
||||
productOrderEntity.setUdi(selectManuorderResponse.getUuid());
|
||||
productOrderEntity.setOrderId(selectManuorderResponse.getOrderID());
|
||||
productOrderEntities.add(productOrderEntity);
|
||||
}
|
||||
productService.insertProductList(productOrderEntities);
|
||||
|
||||
for (ProductOrderEntity productOrderEntity : productOrderEntities) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
paramMap.put("orderId", productOrderEntity.getOrderId());
|
||||
String response = HttpClient.mipsGet(url + "/mips/barcode/list", paramMap);
|
||||
MipsBarcodeResponse mipsBarcodeResponse;
|
||||
try {
|
||||
mipsBarcodeResponse = (MipsBarcodeResponse) JSONObject.parseObject(response, MipsBarcodeResponse.class);
|
||||
} catch (Exception e) {
|
||||
return ResultVOUtils.error(911, "连接mips服务出错");
|
||||
}
|
||||
if (mipsBarcodeResponse.getCode() == 20000) {
|
||||
List<MipsBarcodeResponse.DataBean.ListBean> mipsBarcodes = mipsBarcodeResponse.getData().getList();
|
||||
|
||||
if(mipsBarcodes!=null && mipsBarcodes.size()>0){
|
||||
List<MipsBarcodeEntity> mipsBarcodeEntities = new ArrayList<>();
|
||||
for (MipsBarcodeResponse.DataBean.ListBean mipsBean :mipsBarcodes){
|
||||
MipsBarcodeEntity mipsBarcodeEntity = new MipsBarcodeEntity();
|
||||
mipsBarcodeEntity.setBatchNo(productOrderEntity.getBatchNo());
|
||||
mipsBarcodeEntity.setCloseFlag(productOrderEntity.getCloseFlag()+"");
|
||||
mipsBarcodeEntity.setCode(mipsBean.getBarcode());
|
||||
mipsBarcodeEntity.setCodeLevel(mipsBean.getCodeLevel());
|
||||
mipsBarcodeEntity.setComments(productOrderEntity.getComments());
|
||||
mipsBarcodeEntity.setCount(productOrderEntity.getCount()+"");
|
||||
mipsBarcodeEntity.setExpirationDate(productOrderEntity.getExpirationDate());
|
||||
mipsBarcodeEntity.setLastModifyTime(mipsBean.getPackTime());
|
||||
mipsBarcodeEntity.setManufacturingDate(productOrderEntity.getManufacturingDate());
|
||||
mipsBarcodeEntity.setOrderId(productOrderEntity.getOrderNo());
|
||||
mipsBarcodeEntity.setPackFlag(mipsBean.getPackFlag());
|
||||
mipsBarcodeEntity.setPCode(mipsBean.getParentCodeID()+"");
|
||||
mipsBarcodeEntities.add(mipsBarcodeEntity);
|
||||
}
|
||||
mipsBarcodeService.insertList(mipsBarcodeEntities);
|
||||
}
|
||||
|
||||
|
||||
// if (mipsDrugEntities != null) {
|
||||
// List<SelectManuorderResponse> selectManuorderResponses = new ArrayList<>();
|
||||
// for(ManuOrderEntity manuOrderEntity:mipsDrugEntities){
|
||||
// Druginfo druginfo = druginfoService.selectByNamecode(manuOrderEntity.getCodeNum());
|
||||
// SelectManuorderResponse selectManuorderResponse = new SelectManuorderResponse();
|
||||
// selectManuorderResponse.setBatchNo(manuOrderEntity.getBatchNo());
|
||||
// selectManuorderResponse.setCloseFlag(manuOrderEntity.getCloseFlag());
|
||||
// selectManuorderResponse.setCodeNum(manuOrderEntity.getCodeNum());
|
||||
// selectManuorderResponse.setComments(manuOrderEntity.getComments());
|
||||
// selectManuorderResponse.setDrugProductionDate(manuOrderEntity.getDrugProductionDate());
|
||||
// selectManuorderResponse.setDrugShelfLifeToDate(manuOrderEntity.getDrugShelfLifeToDate());
|
||||
// selectManuorderResponse.setLastModifyTime(manuOrderEntity.getLastModifyTime());
|
||||
// selectManuorderResponse.setName(druginfo.getConame());
|
||||
// selectManuorderResponse.setOrderNo(manuOrderEntity.getOrderNo());
|
||||
// selectManuorderResponse.setOrderQty(manuOrderEntity.getOrderQty());
|
||||
// selectManuorderResponse.setPackRatio(druginfo.getPackratio());
|
||||
// selectManuorderResponse.setSpec(druginfo.getPackspec());
|
||||
// selectManuorderResponse.setUpdate(manuorderService.isExit(manuOrderEntity.getOrderNo()));
|
||||
// selectManuorderResponse.setUuid(druginfo.getUuid());
|
||||
// selectManuorderResponses.add(selectManuorderResponse);
|
||||
// }
|
||||
// PageInfo<SelectManuorderResponse> pageInfo;
|
||||
// pageInfo = new PageInfo<>(selectManuorderResponses);
|
||||
// PageSimpleResponse<SelectManuorderResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
// pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
// pageSimpleResponse.setList(selectManuorderResponses);
|
||||
// return ResultVOUtils.success(pageSimpleResponse);
|
||||
} else {
|
||||
return ResultVOUtils.error(911, "导入失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
// productService.insertProduct(addProductRequest);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 生产订单验证
|
||||
*
|
||||
* @param verifyCodeRequest
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/warehouse/product/verify")
|
||||
public BaseResponse verifyCode(@RequestBody VerifyCodeRequest verifyCodeRequest) {
|
||||
|
||||
String code = verifyCodeRequest.getKey();
|
||||
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
||||
return ResultVOUtils.success(udiEntity);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新验证数量
|
||||
*
|
||||
* @param deleteRequest
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/warehouse/product/updateCount")
|
||||
public BaseResponse updateCount(@RequestBody DeleteRequest deleteRequest) {
|
||||
ProductOrderEntity productOrderEntity = productService.selectById(deleteRequest.getId());
|
||||
int count = productOrderEntity.getCount();
|
||||
productOrderEntity.setCount(count + 1);
|
||||
productService.updateProduct(productOrderEntity);
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,192 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.dao.udid.DeviceMapper;
|
||||
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.ReceiptsEntity;
|
||||
import com.glxp.udi.admin.entity.receipt.ReceiptsdDetailEntity;
|
||||
import com.glxp.udi.admin.entity.udid.Device;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.AddReceiptRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ReceiptDetailRequest;
|
||||
import com.glxp.udi.admin.req.receipt.ReceiptFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.WarehouseService;
|
||||
import com.glxp.udi.admin.service.receipts.ReceiptDetailService;
|
||||
import com.glxp.udi.admin.service.receipts.ReceiptsService;
|
||||
import com.glxp.udi.admin.util.ReceiptBeanUtils;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
public class ReceiptsController {
|
||||
|
||||
@Resource
|
||||
private ReceiptsService receiptsService;
|
||||
@Resource
|
||||
private ReceiptDetailService receiptDetailService;
|
||||
@Resource
|
||||
private WarehouseService warehouseService;
|
||||
@Resource
|
||||
private DeviceMapper deviceMapper;
|
||||
|
||||
|
||||
@GetMapping("/warehouse/receipt/order/filter")
|
||||
public BaseResponse filterReceipt(ReceiptFilterRequest receiptFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ReceiptsEntity> receiptsEntities;
|
||||
|
||||
receiptsEntities = receiptsService.filterList(receiptFilterRequest);
|
||||
|
||||
PageInfo<ReceiptsEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(receiptsEntities);
|
||||
PageSimpleResponse<ReceiptsEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(receiptsEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/warehouse/receipt/code/filter")
|
||||
public BaseResponse listReceiptDetail(ReceiptDetailRequest receiptDetailRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<ReceiptsdDetailEntity> receiptsdDetailEntities;
|
||||
|
||||
receiptsdDetailEntities = receiptDetailService.listReceiptsDetail(receiptDetailRequest);
|
||||
|
||||
PageInfo<ReceiptsdDetailEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(receiptsdDetailEntities);
|
||||
PageSimpleResponse<ReceiptsdDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(receiptsdDetailEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/receipt/addList")
|
||||
public BaseResponse addList(@RequestBody AddReceiptRequest addReceiptRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<AddReceiptRequest.ReceiptRequest> receiptRequests = addReceiptRequest.getReceipts();
|
||||
List<ReceiptsEntity> receiptsEntityList = new ArrayList<>();
|
||||
if (receiptRequests != null && receiptRequests.size() > 0) {
|
||||
for (int i = 0; i < receiptRequests.size(); i++) {
|
||||
ReceiptsEntity receiptsEntity = ReceiptBeanUtils.requestToEntity(receiptRequests.get(i), i);
|
||||
receiptsEntityList.add(receiptsEntity);
|
||||
}
|
||||
receiptsService.insertReceipts(receiptsEntityList);
|
||||
for (int i = 0; i < receiptsEntityList.size(); i++) {
|
||||
ReceiptsEntity receiptsEntity = receiptsEntityList.get(i);
|
||||
List<WarehouseEntity> warehouseEntityList = warehouseService.findByReceiptId(receiptsEntity.getReceiptNo());
|
||||
try {
|
||||
filterReceipt(receiptsEntity.getId(), warehouseEntityList);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
return ResultVOUtils.error(500, "UDI码错误");
|
||||
}
|
||||
}
|
||||
}
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
public void drugFilter(){
|
||||
|
||||
}
|
||||
|
||||
public void filterReceipt(String receiptId, List<WarehouseEntity> warehouseEntityList) {
|
||||
Map<String, Integer> groups = new HashMap<String, Integer>();
|
||||
List<ReceiptsdDetailEntity> receiptsdDetailEntities = new ArrayList<>();
|
||||
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
||||
String code = warehouseEntity.getCode().substring(2, 16);
|
||||
groups.put(code, 0);
|
||||
}
|
||||
for (String code : groups.keySet()) {
|
||||
int count = 0;
|
||||
WarehouseEntity temp = null;
|
||||
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
||||
if (warehouseEntity.getCode().substring(2, 16).equals(code)) {
|
||||
count++;
|
||||
temp = warehouseEntity;
|
||||
groups.put(code, count);
|
||||
}
|
||||
}
|
||||
Device device = deviceMapper.searchByBs(code);
|
||||
ReceiptsdDetailEntity receiptsdDetailEntity = new ReceiptsdDetailEntity();
|
||||
receiptsdDetailEntity.setReceiptId(receiptId);
|
||||
receiptsdDetailEntity.setCode(code);
|
||||
receiptsdDetailEntity.setName(device.getCpmctymc());
|
||||
receiptsdDetailEntity.setSpec(device.getGgxh());
|
||||
receiptsdDetailEntity.setPermitNo(device.getZczbhhzbapzbh());
|
||||
receiptsdDetailEntity.setCount(count);
|
||||
receiptsdDetailEntity.setEnterprise(device.getYlqxzcrbarmc());
|
||||
receiptsdDetailEntity.setStockRange(device.getTscchcztj());
|
||||
|
||||
if (temp != null) {
|
||||
receiptsdDetailEntity.setInoutDate(temp.getActDate());
|
||||
receiptsdDetailEntity.setUnit(temp.getFromCorp());
|
||||
receiptsdDetailEntity.setBatchNo(temp.getBatchNo());
|
||||
receiptsdDetailEntity.setExpireDate(temp.getExpireDate());
|
||||
receiptsdDetailEntity.setProduceDate(temp.getProduceDate());
|
||||
}
|
||||
receiptsdDetailEntity.setIsGift("");
|
||||
receiptsdDetailEntity.setRemark("");
|
||||
receiptsdDetailEntity.setTonCount(0);
|
||||
receiptsdDetailEntities.add(receiptsdDetailEntity);
|
||||
}
|
||||
receiptDetailService.insertReceiptsDetails(receiptsdDetailEntities);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/receipt/updateReceipt")
|
||||
public BaseResponse updateReceipt(@RequestBody ReceiptsEntity receiptsEntity,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (receiptsEntity != null) {
|
||||
receiptsService.updateReceipts(receiptsEntity);
|
||||
} else {
|
||||
ResultVOUtils.error(999, "参数错误");
|
||||
}
|
||||
|
||||
|
||||
return ResultVOUtils.success("添加成功");
|
||||
}
|
||||
|
||||
@PostMapping("warehouse/receipt/deleteReceipt")
|
||||
public BaseResponse deleteReceipt(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
receiptsService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package com.glxp.udi.admin.controller.receipts;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.udi.admin.entity.inout.Unit;
|
||||
import com.glxp.udi.admin.entity.receipt.UnitMaintainEntity;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import com.glxp.udi.admin.req.receipt.CombineUnitRequest;
|
||||
import com.glxp.udi.admin.req.receipt.UnitMaintainFilterRequest;
|
||||
import com.glxp.udi.admin.res.PageSimpleResponse;
|
||||
import com.glxp.udi.admin.service.inout.UnitService;
|
||||
import com.glxp.udi.admin.service.receipts.UnitMaintainService;
|
||||
import com.glxp.udi.common.enums.ResultEnum;
|
||||
import com.glxp.udi.common.res.BaseResponse;
|
||||
import com.glxp.udi.common.util.ResultVOUtils;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 往来单位信息维护
|
||||
*/
|
||||
@RestController
|
||||
public class UnitMaintainController {
|
||||
|
||||
@Resource
|
||||
private UnitMaintainService unitMaintainService;
|
||||
@Resource
|
||||
private UnitService unitService;
|
||||
|
||||
@GetMapping("/warehouse/unitMaintain/filter")
|
||||
public BaseResponse filterUnitMaintain(UnitMaintainFilterRequest unitMaintainFilterRequest,
|
||||
BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UnitMaintainEntity> unitMaintainEntities;
|
||||
unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest);
|
||||
PageInfo<UnitMaintainEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(unitMaintainEntities);
|
||||
PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(unitMaintainEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/combine")
|
||||
public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<String> keys = combineRequest.getKeys();
|
||||
if (keys != null && keys.size() > 0) {
|
||||
for (String key : keys) {
|
||||
Unit unit = unitService.selectById(key);
|
||||
UnitMaintainEntity unitMaintainEntity = new UnitMaintainEntity();
|
||||
unitMaintainEntity.setThirdId(combineRequest.getThirdId());//关联第三方ID
|
||||
unitMaintainEntity.setAddr(unit.getAddr());
|
||||
unitMaintainEntity.setName(unit.getName());
|
||||
unitMaintainEntity.setSpell(unit.getSpell());
|
||||
unitMaintainEntity.setStatus(unit.getStatus());
|
||||
unitMaintainEntity.setType(unit.getType());
|
||||
unitMaintainEntity.setUnitId(unit.getUnitId());
|
||||
unitMaintainService.insertUnitMaintain(unitMaintainEntity);
|
||||
}
|
||||
}
|
||||
|
||||
return ResultVOUtils.success("合并成功");
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/warehouse/unitMaintain/delete")
|
||||
public BaseResponse deleteUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
String id = deleteRequest.getId();
|
||||
|
||||
unitMaintainService.deleteById(id);
|
||||
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.AuthAdmin;
|
||||
import com.glxp.udi.admin.entity.auth.UpdateUserflagBean;
|
||||
import com.glxp.udi.admin.req.auth.AuthAdminQueryRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface AuthAdminDao {
|
||||
|
||||
/**
|
||||
* 后台业务查询列表
|
||||
*
|
||||
* @return 列表
|
||||
*/
|
||||
List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest);
|
||||
|
||||
/**
|
||||
* 根据id查询
|
||||
*
|
||||
* @param id 传入的id
|
||||
* @return
|
||||
*/
|
||||
AuthAdmin findById(Long id);
|
||||
|
||||
/**
|
||||
* 根据id查询 password
|
||||
*
|
||||
* @param id 传入的id
|
||||
* @return
|
||||
*/
|
||||
AuthAdmin findPwdById(Long id);
|
||||
|
||||
/**
|
||||
* 根据Name
|
||||
*
|
||||
* @param userName 用户名
|
||||
* @return
|
||||
*/
|
||||
AuthAdmin findByUserName(String userName);
|
||||
|
||||
/**
|
||||
* 插入
|
||||
*
|
||||
* @param authAdmin
|
||||
* @return
|
||||
*/
|
||||
boolean insertAuthAdmin(AuthAdmin authAdmin);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param authAdmin
|
||||
* @return
|
||||
*/
|
||||
boolean updateAuthAdmin(AuthAdmin authAdmin);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
boolean deleteById(Long id);
|
||||
|
||||
boolean deleteByCustomerId(Long id);
|
||||
|
||||
List<AuthAdmin> findByCustomerId(Long id);
|
||||
|
||||
int findCountByCustomerId(Long id);
|
||||
|
||||
boolean updateUserByCustomerId(UpdateUserflagBean userflagBean);
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.AuthPermission;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface AuthPermissionDao {
|
||||
|
||||
/**
|
||||
* 根据roleIds查询
|
||||
* @param roleIds 传入的id
|
||||
* @return
|
||||
*/
|
||||
List<AuthPermission> listByRoleIdIn(List<Long> roleIds);
|
||||
|
||||
/**
|
||||
* 根据 roleId 查询
|
||||
* @param roleId 传入的id
|
||||
* @return
|
||||
*/
|
||||
List<AuthPermission> listByRoleId(Long roleId);
|
||||
|
||||
|
||||
/**
|
||||
* 批量插入
|
||||
* @param authPermissionList
|
||||
* @return
|
||||
*/
|
||||
int insertAuthPermissionAll(List<AuthPermission> authPermissionList);
|
||||
|
||||
/**
|
||||
* 根据角色id删除
|
||||
* @param roleId
|
||||
* @return
|
||||
*/
|
||||
boolean deleteByRoleId(Long roleId);
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.AuthPermissionRule;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Mapper
|
||||
public interface AuthPermissionRuleDao {
|
||||
|
||||
/**
|
||||
* 根据ids查询 规则名称
|
||||
* @param ids 传入的ids
|
||||
* @return
|
||||
*/
|
||||
List<AuthPermissionRule> listByIdIn(List<Long> ids);
|
||||
|
||||
/**
|
||||
* 查询所有
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
List<AuthPermissionRule> listAll();
|
||||
|
||||
/**
|
||||
* 根据 父级 pid 查询
|
||||
* @param pid
|
||||
* @return
|
||||
*/
|
||||
List<AuthPermissionRule> listByPid(Long pid);
|
||||
|
||||
/**
|
||||
* 根据 规则名称查询
|
||||
* @param name
|
||||
* @return
|
||||
*/
|
||||
AuthPermissionRule findByName(String name);
|
||||
|
||||
/**
|
||||
* 插入
|
||||
* @param authPermissionRule
|
||||
* @return
|
||||
*/
|
||||
boolean insertAuthPermissionRule(AuthPermissionRule authPermissionRule);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
* @param authPermissionRule
|
||||
* @return
|
||||
*/
|
||||
boolean updateAuthPermissionRule(AuthPermissionRule authPermissionRule);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
boolean deleteById(Long id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.AuthRoleAdmin;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Mapper
|
||||
public interface AuthRoleAdminDao {
|
||||
|
||||
/**
|
||||
* 根据 adminId 查询
|
||||
* @param adminId 传入的 adminId
|
||||
* @return
|
||||
*/
|
||||
List<AuthRoleAdmin> listByAdminId(Long adminId);
|
||||
|
||||
/**
|
||||
* 根据 多个 adminId 查询
|
||||
* @param adminIds 传入的 adminIds
|
||||
* @return
|
||||
*/
|
||||
List<AuthRoleAdmin> listByAdminIdIn(List<Long> adminIds);
|
||||
|
||||
/**
|
||||
* 根据 role_id 查询 admin_id
|
||||
* @param roleId 传入的 roleId
|
||||
* @return
|
||||
*/
|
||||
List<AuthRoleAdmin> listByRoleId(Long roleId);
|
||||
|
||||
/**
|
||||
* 批量插入
|
||||
* @param authRoleAdminList
|
||||
* @return
|
||||
*/
|
||||
int insertAuthRoleAdminAll(List<AuthRoleAdmin> authRoleAdminList);
|
||||
|
||||
|
||||
/**
|
||||
* 根据 adminId 删除
|
||||
* @param adminId
|
||||
* @return
|
||||
*/
|
||||
boolean deleteByAdminId(Long adminId);
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.req.auth.AuthRoleQueryRequest;
|
||||
import com.glxp.udi.admin.entity.auth.AuthRole;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface AuthRoleDao {
|
||||
|
||||
/**
|
||||
* 后台管理业务查询列表
|
||||
* @return 列表
|
||||
*/
|
||||
List<AuthRole> listAdminPage(AuthRoleQueryRequest authRoleQueryRequest);
|
||||
|
||||
/**
|
||||
* 返回id,name 字段的列表
|
||||
* @return 列表
|
||||
*/
|
||||
List<AuthRole> listAuthAdminRolePage(Integer status);
|
||||
|
||||
List<AuthRole> listCustomerRoles(Integer isCustomer);
|
||||
|
||||
|
||||
AuthRole findByName(String name);
|
||||
|
||||
/**
|
||||
* 插入
|
||||
* @param authAdmin
|
||||
* @return
|
||||
*/
|
||||
boolean insertAuthRole(AuthRole authAdmin);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
* @param authAdmin
|
||||
* @return
|
||||
*/
|
||||
boolean updateAuthRole(AuthRole authAdmin);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
boolean deleteById(Long id);
|
||||
AuthRole findById(Long id);
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.CustomerContactEntity;
|
||||
import com.glxp.udi.admin.req.auth.CustomerContactFilterRequest;
|
||||
import com.glxp.udi.admin.req.inout.DeleteRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CustomerContacDao {
|
||||
|
||||
List<CustomerContactEntity> filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest);
|
||||
|
||||
boolean insertCustomerContact(CustomerContactEntity customerContactEntity);
|
||||
|
||||
boolean updateCustomerContact(CustomerContactEntity customerContactEntity);
|
||||
|
||||
boolean deleteById(Long customerId);
|
||||
|
||||
CustomerContactEntity selectById(Long customerId);
|
||||
|
||||
boolean deleteContact(DeleteRequest deleteRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.CustomerDetailEntity;
|
||||
import com.glxp.udi.admin.entity.auth.CustomerInfoEntity;
|
||||
import com.glxp.udi.admin.req.auth.CustomerInfoFilterRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@Mapper
|
||||
public interface CustomerInfoDao {
|
||||
|
||||
|
||||
List<CustomerInfoEntity> filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest);
|
||||
List<CustomerDetailEntity> filterDetailCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest);
|
||||
|
||||
|
||||
boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity);
|
||||
|
||||
boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity);
|
||||
|
||||
boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity);
|
||||
|
||||
boolean deleteById(Long customerId);
|
||||
|
||||
CustomerInfoEntity selectById(Long customerId);
|
||||
|
||||
CustomerDetailEntity selectDetail(Long customerId);
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.glxp.udi.admin.dao.auth;
|
||||
|
||||
import com.glxp.udi.admin.entity.auth.UserRegisterEntity;
|
||||
import com.glxp.udi.admin.req.auth.UserResisterFilterRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface UserRegisterDao {
|
||||
|
||||
List<UserRegisterEntity> filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest);
|
||||
|
||||
boolean insertUserRegister(UserRegisterEntity userRegisterEntity);
|
||||
|
||||
boolean updateUserRegister(UserRegisterEntity userRegisterEntity);
|
||||
|
||||
boolean deleteById(Long id);
|
||||
|
||||
UserRegisterEntity selectById(Integer id);
|
||||
|
||||
UserRegisterEntity selectByCustomerId(Long id);
|
||||
|
||||
|
||||
|
||||
boolean deleteByCustomerId(Long id);
|
||||
|
||||
String isExit(String phoneNum);
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.udi.admin.dao.contrast;
|
||||
|
||||
import com.glxp.udi.admin.entity.contrast.CodeContrastEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CodeContrastDao {
|
||||
|
||||
boolean insertCodeContrast(CodeContrastEntity codeContrastEntity);
|
||||
|
||||
boolean insertCodeContrastList(@Param("codeContrastEntitys") List<CodeContrastEntity> codeContrastEntitys);
|
||||
|
||||
List<CodeContrastEntity> selectByCustomerId(Long customerId);
|
||||
|
||||
// List<CodeContrastEntity> filterCodeContrast(FilterCodeContrastRequest filterCodeContrastRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.glxp.udi.admin.dao.contrast;
|
||||
|
||||
import com.glxp.udi.admin.entity.contrast.CodeContrastDetailEntity;
|
||||
import com.glxp.udi.admin.entity.contrast.CustomercontrastEntity;
|
||||
import com.glxp.udi.admin.req.contrast.DeleteCustomerContrastRequest;
|
||||
import com.glxp.udi.admin.req.contrast.FilterCodeContrastRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CustomercontrastDao {
|
||||
|
||||
boolean insertCustomercontrast(CustomercontrastEntity customercontrastEntity);
|
||||
|
||||
boolean insertCustomercontrastList(@Param("customercontrastEntities") List<CustomercontrastEntity> customercontrastEntities);
|
||||
|
||||
List<CustomercontrastEntity> selectByCustomerId(Long customerId);
|
||||
|
||||
List<CodeContrastDetailEntity> filterDetailByCustomerId(FilterCodeContrastRequest filterCodeContrastRequest);
|
||||
List<CodeContrastDetailEntity> filterDetailAll(FilterCodeContrastRequest filterCodeContrastRequest);
|
||||
|
||||
|
||||
boolean deleteCustomercontrast(DeleteCustomerContrastRequest deleteCustomerContrastRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.udi.admin.dao.contrast;
|
||||
|
||||
import com.glxp.udi.admin.entity.contrast.WhitecodeEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface WhitecodeDao {
|
||||
List<WhitecodeEntity> selectAll();
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.CompanyEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface CompanyDao {
|
||||
|
||||
CompanyEntity findCompany(Long CustomerId);
|
||||
|
||||
boolean modifyCompany(CompanyEntity companyEntity);
|
||||
|
||||
boolean insertCompany(CompanyEntity companyEntity);
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.EnterpriseCertEntity;
|
||||
import com.glxp.udi.admin.req.info.DeleteEnterpriseCertRequest;
|
||||
import com.glxp.udi.admin.req.info.FilterEnterpriseCertRequest;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface EnterpriseCertDao {
|
||||
|
||||
boolean insertEnterpriseCert(EnterpriseCertEntity enterpriseCertEntity);
|
||||
|
||||
boolean insertEnterpriseCertList(@Param("enterpriseCertEntities") List<EnterpriseCertEntity> enterpriseCertEntities);
|
||||
|
||||
boolean deleteEnterpriseCert(DeleteEnterpriseCertRequest deleteEnterpriseCertRequest);
|
||||
|
||||
boolean modifyEnterpriseCert(EnterpriseCertEntity EnterpriseCertEntity);
|
||||
|
||||
List<EnterpriseCertEntity> selectBySubProductId(String subProductId);
|
||||
|
||||
List<EnterpriseCertEntity> filterEnterpriseCerts(FilterEnterpriseCertRequest filterEnterpriseCertRequest);
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.EnterpriseEntity;
|
||||
import com.glxp.udi.admin.req.info.DeleteEnterpriseRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface EnterpriseDao {
|
||||
|
||||
boolean insertEnterprise(EnterpriseEntity enterpriseEntity);
|
||||
|
||||
boolean insertEnterpriseList(@Param("enterpriseEntities") List<EnterpriseEntity> enterpriseEntities);
|
||||
|
||||
boolean deleteEnterprise(DeleteEnterpriseRequest deleteEnterpriseRequest);
|
||||
|
||||
boolean modifyEnterprise(EnterpriseEntity enterpriseEntity);
|
||||
|
||||
List<EnterpriseEntity> selectBySubProductId(String subProductId);
|
||||
|
||||
List<EnterpriseEntity> filterEnterprises(String subProductId);
|
||||
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.FacidentcodeEntity;
|
||||
import com.glxp.udi.admin.req.info.DeleteFacidentcodeRequest;
|
||||
import com.glxp.udi.admin.req.info.FilterFacidentcodeRequest;
|
||||
import com.glxp.udi.admin.res.basic.FacidentcodeResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface FacidentcodeDao {
|
||||
|
||||
boolean insertFacidentcode(FacidentcodeEntity facidentcodeEntity);
|
||||
|
||||
boolean insertFacidentcodeList(@Param("facidentcodeEntities") List<FacidentcodeEntity> facidentcodeEntities);
|
||||
|
||||
boolean deleteFacidentcode(DeleteFacidentcodeRequest deleteFacidentcodeRequest);
|
||||
|
||||
boolean modifyFacidentcode(FacidentcodeEntity facidentcodeEntity);
|
||||
|
||||
List<FacidentcodeResponse> selectByCustomerId(FilterFacidentcodeRequest filterFacidentcodeRequest);
|
||||
|
||||
List<String> selectAll(String customerId);
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.IdentifierEntity;
|
||||
import com.glxp.udi.admin.req.info.DeleteIdentifierRequest;
|
||||
import com.glxp.udi.admin.req.info.FilterIdentifierRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface IdentifierDao {
|
||||
|
||||
boolean insertIdentifier(IdentifierEntity identifierEntity);
|
||||
|
||||
boolean insertIdentifierList(@Param("identifierEntities") List<IdentifierEntity> identifierEntities);
|
||||
|
||||
boolean deleteIdentifier(DeleteIdentifierRequest deleteIdentifierRequest);
|
||||
|
||||
boolean modifyIdentifier(IdentifierEntity identifierEntity);
|
||||
|
||||
boolean deleteIdentifierByFacidentcode(String UDI_FacIdentCode_FK);
|
||||
|
||||
List<IdentifierEntity> selectByfacident(FilterIdentifierRequest filterIdentifierRequest);
|
||||
|
||||
String randomCode(FilterIdentifierRequest filterIdentifierRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.glxp.udi.admin.dao.info;
|
||||
|
||||
import com.glxp.udi.admin.entity.info.StandagencyEntity;
|
||||
import com.glxp.udi.admin.req.info.DeleteStandagencyRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface StandagencyDao {
|
||||
|
||||
boolean insertStandagency(StandagencyEntity standagencyEntity);
|
||||
|
||||
boolean deleteStandagency(DeleteStandagencyRequest deleteStandagencyRequest);
|
||||
|
||||
boolean modifyStandagency(StandagencyEntity standagencyEntity);
|
||||
|
||||
List<StandagencyEntity> selectAll();
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.Druginfo;
|
||||
import com.glxp.udi.admin.req.inout.DrugFilterRequest;
|
||||
import com.glxp.udi.admin.req.inout.DrugInfoRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface DruginfoDao {
|
||||
|
||||
List<Druginfo> listDrugInfo(DrugInfoRequest drugInfoRequest);
|
||||
|
||||
List<Druginfo> filterDrugInfo(DrugFilterRequest drugInfoRequest);
|
||||
|
||||
boolean insertDrugInfo(Druginfo druginfo);
|
||||
|
||||
boolean updateDrugInfo(Druginfo druginfo);
|
||||
|
||||
boolean deleteById(long id);
|
||||
|
||||
List<Druginfo> getSimplyDrugs(@Param("coName") String coName, @Param("packRatio") String packRatio,@Param("packSpec") String packSpec);
|
||||
|
||||
String isExit(@Param("nameCode") String nameCode);
|
||||
|
||||
List<Druginfo> getDrugsByUuid(@Param("uuid") String uuid);
|
||||
|
||||
Druginfo selectByNamecode(@Param("nameCode") String nameCode);
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.udi.admin.dao.inout;
|
||||
|
||||
import com.glxp.udi.admin.entity.inout.Druginfo;
|
||||
import com.glxp.udi.admin.entity.inout.DruginfoExample;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
@Mapper
|
||||
public interface DruginfoMapper {
|
||||
long countByExample(DruginfoExample example);
|
||||
|
||||
int deleteByExample(DruginfoExample example);
|
||||
|
||||
int deleteByPrimaryKey(String namecode);
|
||||
|
||||
int insert(Druginfo record);
|
||||
|
||||
int insertSelective(Druginfo record);
|
||||
|
||||
List<Druginfo> selectByExample(DruginfoExample example);
|
||||
|
||||
Druginfo selectByPrimaryKey(String namecode);
|
||||
|
||||
int updateByExampleSelective(@Param("record") Druginfo record, @Param("example") DruginfoExample example);
|
||||
|
||||
int updateByExample(@Param("record") Druginfo record, @Param("example") DruginfoExample example);
|
||||
|
||||
int updateByPrimaryKeySelective(Druginfo record);
|
||||
|
||||
int updateByPrimaryKey(Druginfo record);
|
||||
|
||||
int insertDrugs(@Param("druginfos") List<Druginfo> druginfos);
|
||||
|
||||
boolean deleteAll();
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue