commit c95a3ccf7b26dff4b9ef40d67f97b4e05e67a2bf Author: anthonyywj2 <353682448@qq.com> Date: Sat Feb 26 14:54:28 2022 +0800 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..82eca33 --- /dev/null +++ b/.gitignore @@ -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/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..4ee8445 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +udiwms-java \ No newline at end of file diff --git a/api-admin/.gitignore b/api-admin/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/api-admin/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/api-admin/pom.xml b/api-admin/pom.xml new file mode 100644 index 0000000..ecc4d68 --- /dev/null +++ b/api-admin/pom.xml @@ -0,0 +1,359 @@ + + + + sale + com.glxp + 0.0.1 + + 4.0.0 + war + api-admin + + + + + + com.glxp + api-common + + + + org.apache.commons + commons-lang3 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 8.0.21 + runtime + + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + + + + + + + + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.2 + + + com.itfsw + mybatis-generator-plugin + 1.3.8 + + + + com.github.pagehelper + pagehelper + 5.1.7 + + + + + org.projectlombok + lombok + true + + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + + com.alibaba + fastjson + + + + + com.itextpdf + itextpdf + 5.5.10 + + + com.itextpdf + itext-asian + 5.2.0 + + + + + cn.hutool + hutool-all + 5.7.9 + + + + + com.google.zxing + core + 3.3.3 + + + com.google.zxing + javase + 3.3.3 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.apache.tomcat + tomcat-jdbc + provided + + + + + + + org.olap4j + olap4j + 1.2.0 + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.2 + + + com.github.pagehelper + pagehelper-spring-boot-autoconfigure + 1.2.5 + + + + + org.apache.poi + poi + 4.0.0 + + + org.apache.poi + poi-ooxml + 4.0.0 + + + + + + + + net.sf.barcode4j + barcode4j + 2.1 + + + org.olap4je + olap4j + + + + + + net.sf.jasperreports + jasperreports + 6.5.1 + + + com.lowagie + itext + + + + + + net.sf.jasperreports + jasperreports-fonts + 6.0.0 + + + + + com.itextpdf + itext-pdfa + 5.5.0 + + + + cn.lesper + iTextAsian + 3.0 + + + + + + org.apache.xmlgraphics + batik-bridge + 1.11 + + + + org.apache.xmlgraphics + batik-dom + 1.11 + + + + org.eclipse.birt.runtime.3_7_1 + com.lowagie.text + 2.1.7 + + + + + + + + + SP_SYNC_SERVER + + + + org.springframework.boot + spring-boot-maven-plugin + + + + maven-compiler-plugin + + 1.8 + 1.8 + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.4.0 + + src/main/resources/mybatis/configuration.xml + true + true + + + + Generate MyBatis Artifacts + + generate + + + + + + org.mybatis.generator + mybatis-generator-core + 1.4.0 + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java b/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java new file mode 100644 index 0000000..aa929b2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java @@ -0,0 +1,25 @@ +package com.glxp.sale; + +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); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/annotation/AuthRuleAnnotation.java b/api-admin/src/main/java/com/glxp/sale/admin/annotation/AuthRuleAnnotation.java new file mode 100644 index 0000000..dedaf98 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/annotation/AuthRuleAnnotation.java @@ -0,0 +1,17 @@ +package com.glxp.sale.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(); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java b/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java new file mode 100644 index 0000000..c4b70f7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java @@ -0,0 +1,108 @@ +package com.glxp.sale.admin.aspect; + +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.service.auth.AuthLoginService; +import com.glxp.sale.admin.util.JwtUtils; +import com.glxp.sale.common.enums.ResultEnum; +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.sale.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 authRules = authLoginService.listRuleByAdminId(adminId); + // admin 为最高权限 + for (String item : authRules) { + if (item.equals("admin") || item.equals(authRule)) { + return; + } + } + throw new JsonException(ResultEnum.AUTH_FAILED); + } + + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/CorsConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/CorsConfig.java new file mode 100644 index 0000000..2cb1a65 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/CorsConfig.java @@ -0,0 +1,25 @@ +package com.glxp.sale.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; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/DruidStatFilter.java b/api-admin/src/main/java/com/glxp/sale/admin/config/DruidStatFilter.java new file mode 100644 index 0000000..9f2b2de --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/DruidStatFilter.java @@ -0,0 +1,18 @@ +package com.glxp.sale.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 { +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/DruidStatViewServlet.java b/api-admin/src/main/java/com/glxp/sale/admin/config/DruidStatViewServlet.java new file mode 100644 index 0000000..8275b30 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/DruidStatViewServlet.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.config; + +import com.alibaba.druid.support.http.StatViewServlet; + +import javax.servlet.annotation.WebInitParam; +import javax.servlet.annotation.WebServlet; + +/** + * druid监控视图配置 (监控视图配置) + */ +@WebServlet(urlPatterns = "/druid/*", initParams={ + @WebInitParam(name="allow",value="127.0.0.1"),// IP白名单 (没有配置或者为空，则允许所有访问) + @WebInitParam(name="deny",value="192.168.16.111"),// IP黑名单 (存在共同时，deny优先于allow) + @WebInitParam(name="loginUsername",value="sale"),// 用户名 + @WebInitParam(name="loginPassword",value="sale"),// 密码 + @WebInitParam(name="resetEnable",value="true")// 禁用HTML页面上的“Reset All”功能 +}) +public class DruidStatViewServlet extends StatViewServlet { + private static final long serialVersionUID = 2359758657306626394L; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java new file mode 100644 index 0000000..7dc2e52 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java @@ -0,0 +1,49 @@ +package com.glxp.sale.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 {//TODO Mapper + + // 精确到 master 目录，以便跟其他数据源隔离 + static final String PACKAGE = "com.glxp.sale.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(); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java new file mode 100644 index 0000000..41e5bc7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java @@ -0,0 +1,29 @@ +package com.glxp.sale.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; + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/PublicFileUrlConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/PublicFileUrlConfig.java new file mode 100644 index 0000000..83ffbdf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/PublicFileUrlConfig.java @@ -0,0 +1,39 @@ +package com.glxp.sale.admin.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * 公共文件的配置 + */ + +@Configuration +@ConfigurationProperties(prefix = "public-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; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/RedisConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/RedisConfig.java new file mode 100644 index 0000000..693c453 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/RedisConfig.java @@ -0,0 +1,116 @@ +package com.glxp.sale.admin.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.*; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +/** + * redis配置类 + * @program: springbootdemo + * @Date: 2019/2/22 15:20 + * @Author: zjjlive + * @Description: + */ +@Configuration +@EnableCaching //开启注解 +public class RedisConfig extends CachingConfigurerSupport { + + /** + * retemplate相关配置 + * @param factory + * @return + */ + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + + RedisTemplate template = new RedisTemplate<>(); + // 配置连接工厂 + template.setConnectionFactory(factory); + + //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式） + Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer(Object.class); + + ObjectMapper om = new ObjectMapper(); + // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常 + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + jacksonSeial.setObjectMapper(om); + + // 值采用json序列化 + template.setValueSerializer(jacksonSeial); + //使用StringRedisSerializer来序列化和反序列化redis的key值 + template.setKeySerializer(new StringRedisSerializer()); + + // 设置hash key 和value序列化模式 + template.setHashKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(jacksonSeial); + template.afterPropertiesSet(); + + return template; + } + + /** + * 对hash类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public HashOperations hashOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForHash(); + } + + /** + * 对redis字符串类型数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public ValueOperations valueOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForValue(); + } + + /** + * 对链表类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public ListOperations listOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForList(); + } + + /** + * 对无序集合类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public SetOperations setOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForSet(); + } + + /** + * 对有序集合类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public ZSetOperations zSetOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForZSet(); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/WebMvcConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/WebMvcConfig.java new file mode 100644 index 0000000..9a66070 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/WebMvcConfig.java @@ -0,0 +1,25 @@ +package com.glxp.sale.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); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/WebSocketServer.java b/api-admin/src/main/java/com/glxp/sale/admin/config/WebSocketServer.java new file mode 100644 index 0000000..68093ab --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/WebSocketServer.java @@ -0,0 +1,125 @@ +package com.glxp.sale.admin.config; + + +import com.alibaba.fastjson.JSON; +import com.glxp.sale.admin.entity.info.WebSocketEntity; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import javax.websocket.*; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; +import java.io.IOException; +import java.util.concurrent.CopyOnWriteArraySet; + +@Component +@Slf4j +@Service +@ServerEndpoint("/api/websocket/{sid}") +public class WebSocketServer { + private static int onlineCount = 0; + private static CopyOnWriteArraySet webSocketSet = new CopyOnWriteArraySet(); + private Session session; + private String sid = ""; + + /** + * 连接建立成功调用的方法 + */ + @OnOpen + public void onOpen(Session session, @PathParam("sid") String sid) { + this.session = session; + webSocketSet.add(this); //加入set中 + this.sid = sid; + addOnlineCount(); //在线数加1 + try { + sendMessage(new WebSocketEntity("sys", "连接成功")); + log.info("有新窗口开始监听:" + sid + ",当前在线人数为:" + getOnlineCount()); + } catch (IOException e) { + log.error("websocket IO Exception"); + } + } + + /** + * 连接关闭调用的方法 + */ + @OnClose + public void onClose() { + webSocketSet.remove(this); //从set中删除 + subOnlineCount(); //在线数减1 + //断开连接情况下，更新主板占用情况为释放 + log.info("释放的sid为：" + sid); + //这里写你 释放的时候，要处理的业务 + log.info("有一连接关闭！当前在线人数为" + getOnlineCount()); + + } + + /** + * 收到客户端消息后调用的方法 + * + * @ Param message 客户端发送过来的消息 + */ + @OnMessage + public void onMessage(String message, Session session) { + log.info("收到来自窗口" + sid + "的信息:" + message); + //群发消息 + for (WebSocketServer item : webSocketSet) { + try { + item.sendMessage(new WebSocketEntity("back", message)); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + /** + * @ Param session + * @ Param error + */ + @OnError + public void onError(Session session, Throwable error) { + log.error("发生错误"); + error.printStackTrace(); + } + + /** + * 实现服务器主动推送 + */ + public void sendMessage(WebSocketEntity webSocketEntity) throws IOException { + String message = JSON.toJSON(webSocketEntity).toString(); + this.session.getBasicRemote().sendText(message); + } + + public static void sendInfo(String message, String type) { + log.info("推送消息到窗口" + type + "，推送内容:" + message); + + for (WebSocketServer item : webSocketSet) { + try { + if (type == null) { + item.sendMessage(new WebSocketEntity("sid", message)); + } else { + item.sendMessage(new WebSocketEntity(type, message)); + } + } catch (IOException e) { + continue; + } + } + } + + + public static synchronized int getOnlineCount() { + return onlineCount; + } + + public static synchronized void addOnlineCount() { + WebSocketServer.onlineCount++; + } + + public static synchronized void subOnlineCount() { + WebSocketServer.onlineCount--; + } + + public static CopyOnWriteArraySet getWebSocketSet() { + return webSocketSet; + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/BasicProcessStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/BasicProcessStatus.java new file mode 100644 index 0000000..d53581d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/BasicProcessStatus.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.constant; + +/** + * 基础信息导入导出处理状态 + */ +public class BasicProcessStatus { + + public static final int UDIINFO_IMPORT_UNPROCESS = 0; + public static final int UDIINFO_IMPORT_PROCESS = 1; + public static final int UDIINFO_IMPORT_FAIL = 2; + public static final int UDIINFO_IMPORT_SUCCESS = 3; + + public static final int UDIINFO_IMPORT_CODE_UNPROCESS = 0; + public static final int UDIINFO_IMPORT_CODE_SUCESS = 2; + public static final int UDIINFO_IMPORT_CODE_FAIL = 1; + + + public static final int EXPORT_EXCEL = 1; + public static final int EXPORT_SMP = 2; + + + public static final int DATA_TYPE_UDI = 1; + public static final int DATA_TYPE_SP = 2; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/TypeConstant.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/TypeConstant.java new file mode 100644 index 0000000..add480c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/TypeConstant.java @@ -0,0 +1,53 @@ +package com.glxp.sale.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"; //入库 + + + String SALE_OUT = "321"; //零售出库 (321) + String RETURNN_IN = "103"; //退货入库 + String PURCHASE_IN = "102"; //采购入库 + String RETURN_OUT = "202"; //退货出库 + String SUPPLY_IN = "107"; //供应入库 + String SUPPLY_OUT = "209"; //供应出库 + String DESTORY_OUT = "205"; //销毁出库 + String CHECK_OUT = "206"; //抽检出库 + String VACCINE = "322"; //疫苗接种 (322) + + + //状态 + //1.未校验，已校验，校验异常：process,success,error + String CHECKED = "checked";//已校验 + + String UP_NOT_UPLOAD = "up_not_upload";// 上游未上传 + String NOT_STOCK = "not_stock"; //无码库存 + + String UN_UPLOAD = "un_upload"; //未上传 + String UPLOADED = "uploaded"; //已上传 + String UPLOAD_FAIL = "upload_fail"; //上传失败 + String DEAL_FAIL = "deal_fail"; //上传处理异常 + + String DEAL_SUCCESS = "deal_success"; //上传处理成功 + String DL_FAIL = "dl_fail";//下载异常 + String DOWNLOADED = "downloaded";//已完成 + String FINISHED = "finished";//已完成 + String REMOVE = "remove"; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/UdiInfoImportStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/UdiInfoImportStatus.java new file mode 100644 index 0000000..13275e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/UdiInfoImportStatus.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.constant; + +public class UdiInfoImportStatus { + + public static final int UDIINFO_IMPORT_UNPROCESS = 0; + public static final int UDIINFO_IMPORT_PROCESS = 1; + public static final int UDIINFO_IMPORT_FAIL = 2; + public static final int UDIINFO_IMPORT_SUCCESS = 3; + + + + public static final int UDIINFO_IMPORT_CODE_UNPROCESS = 0; + public static final int UDIINFO_IMPORT_CODE_SUCESS = 2; + public static final int UDIINFO_IMPORT_CODE_FAIL = 1; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java new file mode 100644 index 0000000..b45c603 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java @@ -0,0 +1,338 @@ +package com.glxp.sale.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.auth.AuthAdminResponse; +import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import com.glxp.sale.admin.service.auth.AuthRoleService; +import com.glxp.sale.admin.service.auth.CustomerInfoService; +import com.glxp.sale.admin.util.PasswordUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +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.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 管理员相关 + */ +@RestController +public class AuthAdminController { + + @Resource + private AuthAdminService authAdminService; + + @Resource + private AuthRoleService authRoleService; + + @Resource + private AuthRoleAdminService authRoleAdminService; + + /** + * 获取管理员列表 + */ + @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 authRoleAdmins = authRoleAdminService.listByRoleId(authAdminQueryRequest.getRoleId()); + List ids = new ArrayList<>(); + if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) { + ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdmin_id).collect(Collectors.toList()); + } + authAdminQueryRequest.setIds(ids); + } + List authAdminList = authAdminService.listAdminPage(authAdminQueryRequest); + // 查询所有的权限 + List adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList()); + List authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds); + + // 视图列表 + List authAdminResponseList = authAdminList.stream().map(item -> { + AuthAdminResponse authAdminResponse = new AuthAdminResponse(); + BeanUtils.copyProperties(item, authAdminResponse); + List 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 authAdminPageInfo = new PageInfo<>(authAdminList); + PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); + authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); + authAdminPageSimpleResponse.setList(authAdminResponseList); + + return ResultVOUtils.success(authAdminPageSimpleResponse); + + +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// +// if (authAdminQueryRequest.getRoleId() != null) { +// List authRoleAdmins = authRoleAdminService.listByRoleId(authAdminQueryRequest.getRoleId()); +// List ids = new ArrayList<>(); +// if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) { +// ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdmin_id).collect(Collectors.toList()); +// } +// authAdminQueryRequest.setIds(ids); +// } +// List authAdmins = authAdminService.listAdminPage(authAdminQueryRequest); +// List authAdminList = new ArrayList<>(); +// for (AuthAdmin authAdmin : authAdmins) { +// if (!authAdmin.getUserName().equals("admin")) { +// authAdminList.add(authAdmin); +// } +// } +// // 查询所有的权限 +// List adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList()); +// List authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds); +// +// // 视图列表 +// List authAdminResponseList = authAdminList.stream().map(item -> { +// AuthAdminResponse authAdminResponse = new AuthAdminResponse(); +// BeanUtils.copyProperties(item, authAdminResponse); +// List 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 authAdminPageInfo = new PageInfo<>(authAdminList); +// PageSimpleResponse 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 authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null); + PageInfo pageInfo = new PageInfo<>(authRoleList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + List 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/roleCustomers") + @GetMapping("/admin/auth/admin/roleCustomers") + public BaseResponse roleCustomers(@RequestParam(value = "page", defaultValue = "1") Integer page, + @RequestParam(value = "limit", defaultValue = "100") Integer limit) { + AuthAdmin authAdmin = getCustomerId(); + List authRoles = authRoleAdminService.listAdminRole(authAdmin.getId()); + List authRoleList = null; + if (authRoles != null && authRoles.size() > 0) { + int status = authRoles.get(0).getIsCustomer(); + authRoleList = authRoleService.listCustomerRoles(page, limit, status); + } else { + authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null); + } + + PageInfo pageInfo = new PageInfo<>(authRoleList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + List 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 authRoleList = authRoleService.listCustomerRoles(page, limit, 1); +// List authRoleList = authRoleService.listAuthRoles2(page, limit); + PageInfo pageInfo = new PageInfo<>(authRoleList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + List 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()); + } + + // 检查是否存在相同名称的管理员 + 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())); + } + + 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 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(); + } + + + public AuthAdmin getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthPermissionRuleController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthPermissionRuleController.java new file mode 100644 index 0000000..5e81764 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthPermissionRuleController.java @@ -0,0 +1,136 @@ +package com.glxp.sale.admin.controller.auth; + +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.req.auth.AuthPermissionRuleSaveRequest; +import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; +import com.glxp.sale.admin.util.PermissionRuleTreeUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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.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 authPermissionRuleList = authPermissionRuleService.listAll(); + List merge = PermissionRuleTreeUtils.merge(authPermissionRuleList,0L); + + Map 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 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(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java new file mode 100644 index 0000000..742fed3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java @@ -0,0 +1,224 @@ +package com.glxp.sale.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthPermission; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.req.auth.AuthRoleAuthRequest; +import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; +import com.glxp.sale.admin.req.auth.AuthRoleSaveRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.sale.admin.res.auth.AuthRoleResponse; +import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; +import com.glxp.sale.admin.service.auth.AuthPermissionService; +import com.glxp.sale.admin.service.auth.AuthRoleService; +import com.glxp.sale.admin.util.PermissionRuleTreeUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +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 authRoleList = authRoleService.listAdminPage(authRoleQueryRequest); + List authRoleResponseList = authRoleList.stream().map(item -> { + AuthRoleResponse authRoleResponse = new AuthRoleResponse(); + BeanUtils.copyProperties(item, authRoleResponse); + return authRoleResponse; + }).collect(Collectors.toList()); + + PageInfo pageInfo = new PageInfo<>(authRoleList); + PageSimpleResponse 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 authPermissionList = authPermissionService.listByRoleId(id); + List checkedKeys = authPermissionList.stream() + .map(AuthPermission::getPermissionRuleId) + .collect(Collectors.toList()); + + // 查询所有权限规则 + List authPermissionRuleList = authPermissionRuleService.listAll(); + List merge = PermissionRuleTreeUtils.merge(authPermissionRuleList, 0L); + + Map 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 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 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(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java new file mode 100644 index 0000000..740cccb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java @@ -0,0 +1,61 @@ +package com.glxp.sale.admin.controller.auth; + + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.req.auth.CustomerContactFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.impl.CustomerContactService; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 customerContactEntityList = customerContactService.filterCustomerContact(customerFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(customerContactEntityList); + PageSimpleResponse 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, "删除失败"); + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java new file mode 100644 index 0000000..baf500d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java @@ -0,0 +1,148 @@ +package com.glxp.sale.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.*; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import com.glxp.sale.admin.service.auth.CustomerInfoService; +import com.glxp.sale.admin.service.auth.UserRegisterService; +import com.glxp.sale.admin.service.auth.impl.CustomerContactService; +import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 CompanyService companyService; + @Resource + private CustomerInfoService customerInfoService; + @Resource + private CustomerContactService customerContactService; + @Resource + private UserRegisterService userRegisterService; + + + @GetMapping("salewarehouse/customer/list") + public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) { + + List customerDetailEntities = customerInfoService.filterDetailCustomer(customerFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(customerDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(customerDetailEntities); + + for (CustomerDetailEntity customerDetailEntity : customerDetailEntities) { + CompanyEntity companyEntity = companyService.findCompany(customerDetailEntity.getCustomerId()); + if (companyEntity != null) { + customerDetailEntity.setFilePath(companyEntity.getFilePath()); + } + } + + 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()); + } + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + +// if (StringUtils.isNotBlank(customerDetailEntity.getPdfTemplateId())) { +// SystemPDFTemplateEntity systemPDFTemplateEntity = +// systemPDFTemplateService.selectById(customerDetailEntity.getPdfTemplateId()); +// if (systemPDFTemplateEntity != null) { +// systemPDFTemplateRelevanceService.deleteByCustomerId(customerDetailEntity.getCustomerId()); +// SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); +// systemPDFTemplateRelevanceEntity.setTemplate_id(systemPDFTemplateEntity.getId()); +// systemPDFTemplateRelevanceEntity.setCustomerId(customerDetailEntity.getCustomerId()); +// systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); +// } +// } + + 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)); +// systemPDFTemplateRelevanceService.deleteByCustomerId(Long.parseLong(id)); + + + return ResultVOUtils.success("删除成功"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java new file mode 100644 index 0000000..8dedfda --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -0,0 +1,169 @@ +package com.glxp.sale.admin.controller.auth; + +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.auth.LoginRequest; +import com.glxp.sale.admin.req.auth.UpdatePasswordRequest; +import com.glxp.sale.admin.res.auth.LoginUserInfoResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.AuthLoginService; +import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.util.IpUtils; +import com.glxp.sale.admin.util.JwtUtils; +import com.glxp.sale.admin.util.PasswordUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 CompanyService companyService; + + /** + * 用户登录 + * + * @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; + if (loginRequest.getType() != null && loginRequest.getType() == 1) { + authAdmin = authAdminService.findByUser(loginRequest.getUsername(), "110"); + } else + 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, "用户名或密码错误"); + } + + // 更新登录状态 + 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 claims = new HashMap<>(); + claims.put("admin_id", authAdmin.getId()); + String token = JwtUtils.createToken(claims, 86400L); // 一天后过期 + + Map 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 authRules = authLoginService.listRuleByAdminId(authAdmin.getId()); + + LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); + BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + loginUserInfoResponse.setAuthRules(authRules); + + CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId()); + loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName()); + + + 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); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java new file mode 100644 index 0000000..3f13422 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -0,0 +1,397 @@ +package com.glxp.sale.admin.controller.auth; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; +import com.glxp.sale.admin.entity.auth.UserRegisterEntity; +import com.glxp.sale.admin.entity.info.ApilogEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.entity.info.SetupEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.req.auth.RegisterCheckRequest; +import com.glxp.sale.admin.req.auth.ResetPasswdRequest; +import com.glxp.sale.admin.req.auth.UserResisterFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterAliCertRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.auth.CheckCodeRequest; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import com.glxp.sale.admin.service.auth.CustomerInfoService; +import com.glxp.sale.admin.service.auth.UserRegisterService; +import com.glxp.sale.admin.service.auth.impl.CustomerContactService; +import com.glxp.sale.admin.service.info.AliCertService; +import com.glxp.sale.admin.service.info.ApilogService; +import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.info.SetupService; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.UuidUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; +import javax.servlet.http.HttpSession; +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@Slf4j +public class RegisterController { + + private static String Url = "http://106.ihuyi.com/webservice/sms.php?method=Submit"; + + @Resource + UserRegisterService userRegisterService; + @Resource + private AuthRoleAdminService authRoleAdminService; + @Resource + private AuthAdminService authAdminService; + @Resource + private CustomerInfoService customerInfoService; + @Resource + private CustomerContactService customerContactService; + + @Resource + private SetupService setupService; + @Resource + private CompanyService companyService; + @Resource + private AliCertService aliCertService; + @Resource + ApilogService apilogService; + + + @Resource + private SystemParamConfigService systemParamConfigService; + + @GetMapping("salewarehouse/register/list") + public BaseResponse filterList(UserResisterFilterRequest userResisterFilterRequest) { + + List userRegisterEntities = userRegisterService.filterUserRegisters(userResisterFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(userRegisterEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(userRegisterEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("salewarehouse/register/getCheckcode") + public BaseResponse getCheckcode(@RequestBody CheckCodeRequest checkCodeRequest, HttpSession httpSession) { + + if (checkCodeRequest.getUserName() != null) { + AuthAdmin authAdmin = authAdminService.findByUserName(checkCodeRequest.getUserName()); + if (authAdmin == null) { + return ResultVOUtils.error(500, "未找到该用户"); + } + UserRegisterEntity userRegisterEntity = userRegisterService.selectByCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); + + if (!userRegisterEntity.getMobile().equals(checkCodeRequest.getPhoneNum())) { + return ResultVOUtils.error(500, "手机号与注册时不一致"); + } + } + + RestTemplate restTemplate = new RestTemplate(); + int mobile_code = (int) ((Math.random() * 9 + 1) * 100000); + MultiValueMap postParameters = new LinkedMultiValueMap<>(); + int time = 5; + String content = new String("您正在进行手机验证，验证码是" + mobile_code + "，" + time + "分钟内有效。"); + postParameters.add("account", "C07086222"); + postParameters.add("password", "2dddbbf73636c193c5903324bdb47c5c"); + postParameters.add("mobile", checkCodeRequest.getPhoneNum()); + postParameters.add("content", content); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/x-www-form-urlencoded;charset=GBK"); + HttpEntity> httpEntity = new HttpEntity<>(postParameters, headers); + String response = restTemplate.postForObject(Url, httpEntity, String.class); + if (response.contains("提交成功")) { + JSONObject json = new JSONObject(); + json.put("memPhone", checkCodeRequest.getPhoneNum()); + json.put("code", mobile_code); + json.put("createTime", System.currentTimeMillis()); + // 将认证码存入SESSION + httpSession.setAttribute("code", json); + log.info(httpSession.getId() + "---" + httpSession); + return ResultVOUtils.success("发送成功" + " " + mobile_code); + } else + return ResultVOUtils.error(500, "验证码发送失败"); + + } + + + @GetMapping("salewarehouse/register/getRegisterConfig") + public BaseResponse getRegisterConfig() { + + Map rMap = new HashMap<>(); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("register_company_check"); + if (systemParamConfigEntity == null + || StringUtils.isBlank(systemParamConfigEntity.getParamValue()) + || systemParamConfigEntity.getParamValue().equals("0")) { + rMap.put("companyCheckStatus", false); + } else { + rMap.put("companyCheckStatus", true); + } + return ResultVOUtils.success(rMap); + } + + @PostMapping("salewarehouse/register/deleteResiter") + public BaseResponse deleteResiter(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + String id = deleteRequest.getId(); + userRegisterService.deleteById(Long.parseLong(id)); + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("salewarehouse/register/update") + public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = userRegisterService.updateUserRegister(userRegisterEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功"); + } + + @PostMapping("salewarehouse/register/save") + public BaseResponse saveRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, HttpSession httpSession, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + log.info(httpSession.getId()); + JSONObject userCode = (JSONObject) httpSession.getAttribute("code"); + if (userCode == null) { + return ResultVOUtils.error(500, "验证码已失效，请重新获取"); + } + long lastTime = userCode.getLong("createTime"); + int checkCode = (Integer) userCode.get("code"); + String phoneNum = userCode.getString("memPhone"); + if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) { + return ResultVOUtils.error(500, "验证码已过期，请重新获取"); + } + if (checkCode != userRegisterEntity.getCheckCode()) { + return ResultVOUtils.error(500, "验证码错误，请重新获取"); + } + if (!phoneNum.equals(userRegisterEntity.getMobile())) { + return ResultVOUtils.error(500, "手机号与获取验证码不一致"); + } + boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile()); + if (isExitPhone) { + return ResultVOUtils.error(500, "该手机号已被注册"); + } + + userRegisterEntity.setRegisterTime(DateUtil.getDateTime()); + userRegisterEntity.setCheckType(0);//未审核 + String userName = UuidUtils.getShortUuid(4); + switch (userRegisterEntity.getBussinessStatus()) { + case 1: + userName = "YY" + userName; + break; + case 2: + userName = "JYQY" + userName; + break; + default: + userName = "JYQY" + userName; + break; + } + userRegisterEntity.setUserName(userName); + boolean b = userRegisterService.insertUserRegister(userRegisterEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(userRegisterEntity.getUserName()); + } + + @PostMapping("salewarehouse/reset/passwd") + public BaseResponse resetPasswd(@RequestBody @Valid ResetPasswdRequest resetPasswdRequest, HttpSession httpSession, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + log.info(httpSession.getId()); + JSONObject userCode = (JSONObject) httpSession.getAttribute("code"); + if (userCode == null) { + return ResultVOUtils.error(500, "验证码已失效，请重新获取"); + } + long lastTime = userCode.getLong("createTime"); + int checkCode = (Integer) userCode.get("code"); + String phoneNum = userCode.getString("memPhone"); + if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) { + return ResultVOUtils.error(500, "验证码已过期，请重新获取"); + } + if (checkCode != resetPasswdRequest.getCheckCode()) { + return ResultVOUtils.error(500, "验证码错误，请重新获取"); + } + if (!phoneNum.equals(resetPasswdRequest.getMobile())) { + return ResultVOUtils.error(500, "手机号与获取验证码不一致"); + } + AuthAdmin authAdmin = authAdminService.findByUserName(resetPasswdRequest.getUserName()); + if (authAdmin == null) { + return ResultVOUtils.error(500, "该用户不存在"); + } + CustomerContactEntity customerContactEntity = customerContactService.selectById(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); + if (customerContactEntity != null && customerContactEntity.getMobile().equals(phoneNum)) { + authAdmin.setPassWord(resetPasswdRequest.getPassword()); + authAdminService.updateAuthAdmin(authAdmin); + } else { + return ResultVOUtils.error(500, "手机号与该用户不匹配"); + } + + +// if (!b) { +// return ResultVOUtils.error(ResultEnum.NOT_NETWORK); +// } + return ResultVOUtils.success("密码修改成功"); + } + + @PostMapping("salewarehouse/register/check") + public BaseResponse checkRegister(@RequestBody @Valid RegisterCheckRequest registerCheckRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + long userId = generateUserId(); + if (StringUtils.isNotBlank(registerCheckRequest.getCompanyName())) { + UserRegisterEntity userRegisterEntity = new UserRegisterEntity(); + userRegisterEntity.setId(registerCheckRequest.getId()); + userRegisterEntity.setCompanyId(registerCheckRequest.getCompanyId()); + userRegisterEntity.setCompanyName(registerCheckRequest.getCompanyName()); + userRegisterService.updateUserRegister(userRegisterEntity); + } + UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId()); + userRegisterEntity.setCheckType(registerCheckRequest.getCheckType()); + userRegisterEntity.setCheckTime(DateUtil.getDateTime()); + userRegisterEntity.setUserId(userId + ""); + boolean b = userRegisterService.updateUserRegister(userRegisterEntity); + if (registerCheckRequest.getCheckType() != 1) { + return ResultVOUtils.success("修改成功"); + } + //创建新用户 + AuthAdmin authAdmin = new AuthAdmin(); +// authAdmin.setCustomerId(Integer.valueOf(String.valueOf(userId))); + authAdmin.setCustomerId(userId); + authAdmin.setPassWord(userRegisterEntity.getPassword()); + authAdmin.setCreateTime(DateUtil.parseDate(userRegisterEntity.getCheckTime())); + authAdmin.setUserName(userRegisterEntity.getUserName()); //用手机号当用户名，通过手机号登录 + authAdmin.setEmployeeName(userRegisterEntity.getNickName()); + authAdmin.setUserFlag(1); + authAdminService.insertAuthAdmin(authAdmin); + authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); + + //分配角色 +// List roles = new ArrayList<>(); +// roles.add(Long.valueOf(13));//默认角色 + + + //生产客户信息表 + CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); +// customerInfoEntity.setCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); + customerInfoEntity.setCustomerId(userId); + customerInfoEntity.setArea(userRegisterEntity.getArea()); + customerInfoEntity.setDetailAddr(userRegisterEntity.getDetailAddr()); + customerInfoEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus()); + customerInfoEntity.setCreditNum(userRegisterEntity.getCreditNum()); + customerInfoEntity.setCustomerName(userRegisterEntity.getNickName()); + customerInfoEntity.setUserFlag(1); + customerInfoEntity.setUserMax(2); + customerInfoEntity.setRoleId(registerCheckRequest.getRoles() + ""); + customerInfoEntity.setCompanyName(userRegisterEntity.getCompanyName()); + List roles = new ArrayList<>(); + + if (registerCheckRequest.getRoles() != null) { + roles.add(registerCheckRequest.getRoles()); + authRoleAdminService.insertRolesAdminIdAll(roles, authAdmin.getId()); + } + customerInfoService.insertCustomerInfo(customerInfoEntity); + + //生产客户信息联系人表 + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setContacts(userRegisterEntity.getRealName()); + customerContactEntity.setCustomerId(userId); + customerContactEntity.setEmail(userRegisterEntity.getEmail()); + customerContactEntity.setMobile(userRegisterEntity.getMobile()); + customerContactEntity.setTel(userRegisterEntity.getTel()); + customerContactService.insertCustomerContact(customerContactEntity); + + //生产本企业信息 + CompanyEntity companyEntity = new CompanyEntity(); + companyEntity.setCustomerId(userId); + companyEntity.setArea(userRegisterEntity.getArea()); + companyEntity.setAreaCode(userRegisterEntity.getAreaCode()); + companyEntity.setDetailAddr(userRegisterEntity.getDetailAddr()); + companyEntity.setContacts(customerContactEntity.getContacts()); + companyEntity.setEmail(userRegisterEntity.getEmail()); + companyEntity.setMobile(userRegisterEntity.getMobile()); + companyEntity.setTel(userRegisterEntity.getTel()); + companyEntity.setCompanyName(userRegisterEntity.getCompanyName()); + companyEntity.setUnitIdFk(userRegisterEntity.getCompanyId()); + companyEntity.setClasses(userRegisterEntity.getBussinessStatus() + ""); + companyEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus()); + companyEntity.setCreditNum(userRegisterEntity.getCreditNum()); + + + FilterAliCertRequest filterAliCertRequest = new FilterAliCertRequest(); + filterAliCertRequest.setId(registerCheckRequest.getAliCertId()); + + companyService.insertCompany(companyEntity);//TODO !!!!!!!!!!! + + //生产用户配置表 + SetupEntity setupEntity = new SetupEntity(); + setupEntity.setCheckStock(true); + setupEntity.setCheckUpbill(true); + setupEntity.setCheckRepeat(true); + setupEntity.setDownloadRelation(true); + setupEntity.setUploadTime(24); + setupEntity.setCustomerId(userId + ""); + setupService.insertSetup(setupEntity); + + //生产接口调用日志 + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(userId + ""); + apilogEntity.setLsyd_query_getentinfo(1); + apilogService.insertApilog(apilogEntity); + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功"); + } + + public long generateUserId() { + String userId = System.currentTimeMillis() + ""; + userId = userId.substring(1, userId.length()); + int max = 100, min = 1; + int ran2 = (int) (Math.random() * (max - min) + min); + userId = userId + ran2; + return Long.parseLong(userId); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java new file mode 100644 index 0000000..eeef4da --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java @@ -0,0 +1,110 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.CompanyCertService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class CompanyCertController { + @Resource + private AuthAdminService authAdminService; + @Resource + private CompanyCertService companyCertService; + + @GetMapping("/sale/info/company/cert/filter") + public BaseResponse filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List companyCertEntityList + = companyCertService.filterCompanyCert(filterCompanyCertRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(companyCertEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyCertEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/sale/info/companyCert") + public BaseResponse getCompanyCertInfo(CompanyRequest companyRequest) { + CompanyCertEntity companyCertEntity = companyCertService.findCompanyCert(companyRequest.getCustomerId()); + if (companyCertEntity != null) { + return ResultVOUtils.success(companyCertEntity); + } + return ResultVOUtils.error(500, "空"); + } + + @GetMapping("/sale/info/getCompanyCert") + public BaseResponse getCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest) { + filterCompanyCertRequest.setCustomerId(getCustomerId()); + List companyCertEntities = companyCertService.getCompanyCert(filterCompanyCertRequest); + PageInfo pageInfo = new PageInfo<>(companyCertEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyCertEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/sale/info/insertCompanyCert") + public BaseResponse insertCompanyCert(@RequestBody CompanyCertEntity companyCertEntity) { + companyCertEntity.setCreate_time(new Date()); + companyCertEntity.setUpdate_time(new Date()); + boolean b = companyCertService.insertCompanyCert(companyCertEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/updateCompanyCert") + public BaseResponse updateCompanyCert(@RequestBody CompanyCertEntity companyCertEntity) { + + boolean b = companyCertService.updateCompanyCert(companyCertEntity); + return ResultVOUtils.success("修改成功"); + } + + @PostMapping("/sale/info/deleteCompanyCert") + public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = companyCertService.deleteById(deleteCompanyFileRequest.getId()); + String URL="d:/1s/udiwms/register/file/image2/" + deleteCompanyFileRequest.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java new file mode 100644 index 0000000..e9d90a2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java @@ -0,0 +1,170 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.entity.info.CompanyUpdateLogEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.FilterCompanyRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.impl.CustomerContactService; +import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.info.CompanyUpdateLogService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class CompanyController { + @Resource + private AuthAdminService authAdminService; + @Resource + private CompanyService companyService; + @Resource + CustomerContactService customerContactService; + @Resource + private CompanyUpdateLogService companyUpdateLogService; + + @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, "企业信息为空"); + } + + @GetMapping("/sale/info/getSubCompany") + public BaseResponse getSubCompany(FilterCompanyRequest companyRequest) { +// companyRequest.setCustomerId(getCustomerId()); + List companyEntities = companyService.getSubCompany(companyRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/sale/info/getSubCompany2") + public BaseResponse getSubCompany2(FilterCompanyRequest companyRequest) { + List companyEntities = companyService.getSubCompany2(companyRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/warehouse/info/modifyCompany") + public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) { +// if (companyEntity.getParentCompany() != null && !companyEntity.getParentCompany().equals("")) { +// CompanyEntity parent = companyService.findCompanyByName(companyEntity.getParentCompany()); +// if (parent == null) { +// return ResultVOUtils.error(500, "所属连锁总部未注册，请注册后重试！"); +// } +// companyEntity.setParentIdFk(parent.getCustomerId() + ""); +// } + if (StringUtils.isNotBlank(companyEntity.getNewFilePath())) { + if (StringUtils.isNotBlank(companyEntity.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companyEntity.setFilePath(companyEntity.getNewFilePath()); + } + if (StringUtils.isNotBlank(companyEntity.getNewFilePath2())) { + if (StringUtils.isNotBlank(companyEntity.getFilePath2())) { + String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath2(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companyEntity.setFilePath2(companyEntity.getNewFilePath2()); + } + if (StringUtils.isNotBlank(companyEntity.getNewFilePath3())) { + if (StringUtils.isNotBlank(companyEntity.getFilePath3())) { + String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath3(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companyEntity.setFilePath3(companyEntity.getNewFilePath3()); + } + if (StringUtils.isNotBlank(companyEntity.getNewFilePath4())) { + if (StringUtils.isNotBlank(companyEntity.getFilePath4())) { + String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath4(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companyEntity.setFilePath4(companyEntity.getNewFilePath4()); + } + if (StringUtils.isNotBlank(companyEntity.getNewAuditStatus())) {//0：草稿，6：未审核 + companyEntity.setAuditStatus(companyEntity.getNewAuditStatus()); + } + if (StringUtils.isNotBlank(companyEntity.getAuditStatus()) && + (companyEntity.getAuditStatus().equals("1") || companyEntity.getAuditStatus().equals("2"))) { + CompanyUpdateLogEntity companyUpdateLogEntity = new CompanyUpdateLogEntity(); + companyUpdateLogEntity.setCustomerId(companyEntity.getCustomerId()); + companyUpdateLogEntity.setCreate_time(new Date()); + companyUpdateLogEntity.setUpdate_time(new Date()); + companyUpdateLogEntity.setSubmit(companyEntity.getCompanyName()); + companyUpdateLogEntity.setAuditor(companyEntity.getAuditor()); + companyUpdateLogEntity.setLogType("1");//新增审核 + companyUpdateLogEntity.setUpdateCause("新增审核"); + companyUpdateLogEntity.setNoPassCause(companyEntity.getNoPassCause()); + if (companyEntity.getAuditStatus().equals("1")) { + companyUpdateLogEntity.setStatus("2"); + } else { + companyUpdateLogEntity.setStatus("3"); + } + companyUpdateLogService.insertCompanyUpdateLog(companyUpdateLogEntity); + } + 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()); + + try { + customerContactService.updateCustomerContact(customerContactEntity); + } catch (Exception e) { + + } + return ResultVOUtils.success("修改成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java new file mode 100644 index 0000000..b42ee97 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java @@ -0,0 +1,141 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.CompanySalesmanService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class CompanySalesmanController { + @Resource + private AuthAdminService authAdminService; + @Resource + private CompanySalesmanService companySalesmanService; + + @GetMapping("/sale/info/company/salesman/filter") + public BaseResponse filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List companySalesmanEntityList + = companySalesmanService.filterCompanySalesman(filterCompanySalesmanRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(companySalesmanEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companySalesmanEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/sale/info/companySalesman") + public BaseResponse getCompanySalesmanInfo(CompanyRequest companyRequest) { + CompanySalesmanEntity companySalesmanEntity = companySalesmanService.findCompanySalesman(companyRequest.getCustomerId()); + if (companySalesmanEntity != null) { + return ResultVOUtils.success(companySalesmanEntity); + } + return ResultVOUtils.error(500, "空"); + } + + @GetMapping("/sale/info/getCompanySalesman") + public BaseResponse getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { + filterCompanySalesmanRequest.setCustomerId(getCustomerId()); + List companySalesmanEntities = companySalesmanService.getCompanySalesman(filterCompanySalesmanRequest); + PageInfo pageInfo = new PageInfo<>(companySalesmanEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companySalesmanEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/sale/info/insertCompanySalesman") + public BaseResponse insertCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) { + companySalesmanEntity.setCreate_time(new Date()); + companySalesmanEntity.setUpdate_time(new Date()); + companySalesmanEntity.setAuditStatus("3"); + boolean b = companySalesmanService.insertCompanySalesman(companySalesmanEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/updateCompanySalesman") + public BaseResponse updateCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) { + companySalesmanEntity.setUpdate_time(new Date()); + if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath())) { + if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image5/" + companySalesmanEntity.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companySalesmanEntity.setFilePath(companySalesmanEntity.getNewFilePath()); + } + if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath2())) { + if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath2())) { + String URL="d:/1s/udiwms/register/file/image5/" + companySalesmanEntity.getFilePath2(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + companySalesmanEntity.setFilePath2(companySalesmanEntity.getNewFilePath2()); + } + companySalesmanEntity.setAuditStatus("4"); + boolean b = companySalesmanService.updateCompanySalesman(companySalesmanEntity); + return ResultVOUtils.success("修改成功"); + } + + @PostMapping("/sale/info/deleteCompanySalesman") + public BaseResponse deleteCompanySalesman(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = companySalesmanService.deleteById(deleteCompanyFileRequest.getId()); + if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image5/" + deleteCompanyFileRequest.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath2())) { + String URL="d:/1s/udiwms/register/file/image5/" + deleteCompanyFileRequest.getFilePath2(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java new file mode 100644 index 0000000..f4bed80 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java @@ -0,0 +1,138 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.entity.info.CompanySalesmanUpdateLogEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanUpdateLogRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.CompanySalesmanService; +import com.glxp.sale.admin.service.info.CompanySalesmanUpdateLogService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class CompanySalesmanUpdateLogController { + @Resource + private AuthAdminService authAdminService; + @Resource + private CompanySalesmanUpdateLogService companySalesmanUpdateLogService; + @Resource + private CompanySalesmanService companySalesmanService; + + @GetMapping("/sale/info/company/salesman/update/log/filter") + public BaseResponse filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List companySalesmanUpdateLogEntityList + = companySalesmanUpdateLogService.filterCompanySalesmanUpdateLog(filterCompanySalesmanUpdateLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(companySalesmanUpdateLogEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companySalesmanUpdateLogEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/sale/info/companySalesmanUpdateLog") + public BaseResponse getCompanySalesmanUpdateLogInfo(CompanyRequest companyRequest) { + CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity = companySalesmanUpdateLogService.findCompanySalesmanUpdateLog(companyRequest.getCustomerId()); + if (companySalesmanUpdateLogEntity != null) { + return ResultVOUtils.success(companySalesmanUpdateLogEntity); + } + return ResultVOUtils.error(500, "空"); + } + + @GetMapping("/sale/info/getCompanySalesmanUpdateLog") + public BaseResponse getCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest) { + filterCompanySalesmanUpdateLogRequest.setCustomerId(getCustomerId()); + List companySalesmanUpdateLogEntities = companySalesmanUpdateLogService.getCompanySalesmanUpdateLog(filterCompanySalesmanUpdateLogRequest); + PageInfo pageInfo = new PageInfo<>(companySalesmanUpdateLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companySalesmanUpdateLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/sale/info/insertCompanySalesmanUpdateLog") + public BaseResponse insertCompanySalesmanUpdateLog(@RequestBody CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity) { + CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); + companySalesmanEntity.setId(Integer.parseInt(String.valueOf(companySalesmanUpdateLogEntity.getSalesmanId()))); + companySalesmanEntity.setAuditStatus("4"); + companySalesmanEntity.setUpdate_time(new Date()); + companySalesmanService.updateCompanySalesman(companySalesmanEntity); + + companySalesmanUpdateLogEntity.setCreate_time(new Date()); + companySalesmanUpdateLogEntity.setStatus("1"); + companySalesmanUpdateLogEntity.setLogType("2");//变更审核 + boolean b = companySalesmanUpdateLogService.insertCompanySalesmanUpdateLog(companySalesmanUpdateLogEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/updateCompanySalesmanUpdateLog") + public BaseResponse updateCompanySalesmanUpdateLog(@RequestBody CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity) { + CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); + companySalesmanEntity.setId(Integer.parseInt(String.valueOf(companySalesmanUpdateLogEntity.getSalesmanId()))); + String auditStatus = ""; + if (companySalesmanUpdateLogEntity.getStatus().equals("2")) { + auditStatus = "3"; + } else if (companySalesmanUpdateLogEntity.getStatus().equals("3")) { + auditStatus = "5"; + } + companySalesmanEntity.setAuditStatus(auditStatus); + companySalesmanEntity.setUpdate_time(new Date()); + companySalesmanService.updateCompanySalesman(companySalesmanEntity); + companySalesmanUpdateLogEntity.setUpdate_time(new Date()); + FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest = new FilterCompanySalesmanUpdateLogRequest(); + filterCompanySalesmanUpdateLogRequest.setPage(1); + filterCompanySalesmanUpdateLogRequest.setLimit(1); + filterCompanySalesmanUpdateLogRequest.setCustomerId(String.valueOf(companySalesmanUpdateLogEntity.getCustomerId())); + filterCompanySalesmanUpdateLogRequest.setSalesmanId(String.valueOf(companySalesmanUpdateLogEntity.getSalesmanId())); + List companySalesmanUpdateLogEntities = + companySalesmanUpdateLogService.filterCompanySalesmanUpdateLog(filterCompanySalesmanUpdateLogRequest); + if (companySalesmanUpdateLogEntities.size() > 0) { + CompanySalesmanUpdateLogEntity tCompanySalesmanUpdateLogEntity = companySalesmanUpdateLogEntities.get(0); + companySalesmanUpdateLogEntity.setId(tCompanySalesmanUpdateLogEntity.getId()); + } + boolean b = companySalesmanUpdateLogService.updateCompanySalesmanUpdateLog(companySalesmanUpdateLogEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/deleteCompanySalesmanUpdateLog") + public BaseResponse deleteCompanySalesmanUpdateLog(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = companySalesmanUpdateLogService.deleteById(deleteCompanyFileRequest.getId()); + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java new file mode 100644 index 0000000..af2ccad --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java @@ -0,0 +1,202 @@ +package com.glxp.sale.admin.controller.info; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.entity.info.CompanyUpdateLogEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.info.FilterCompanyUpdateLogRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.CompanySalesmanService; +import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.info.CompanyUpdateLogService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class CompanyUpdateLogController { + @Resource + private AuthAdminService authAdminService; + @Resource + private CompanyUpdateLogService companyUpdateLogService; + @Resource + private CompanySalesmanService companySalesmanService; + @Resource + private CompanyService companyService; + + @GetMapping("/sale/info/company/update/log/filter") + public BaseResponse filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (StringUtils.isBlank(filterCompanyUpdateLogRequest.getCustomerId())) { + filterCompanyUpdateLogRequest.setNoStatus("-1"); + } + List companyUpdateLogEntityList + = companyUpdateLogService.filterCompanyUpdateLog(filterCompanyUpdateLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(companyUpdateLogEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyUpdateLogEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/sale/info/companyUpdateLog") + public BaseResponse getCompanyUpdateLogInfo(CompanyRequest companyRequest) { + CompanyUpdateLogEntity companyUpdateLogEntity = companyUpdateLogService.findCompanyUpdateLog(companyRequest.getCustomerId()); + if (companyUpdateLogEntity != null) { + return ResultVOUtils.success(companyUpdateLogEntity); + } + return ResultVOUtils.error(500, "空"); + } + + @GetMapping("/sale/info/getCompanyUpdateLog") + public BaseResponse getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { + filterCompanyUpdateLogRequest.setCustomerId(getCustomerId()); + List companyUpdateLogEntities = companyUpdateLogService.getCompanyUpdateLog(filterCompanyUpdateLogRequest); + PageInfo pageInfo = new PageInfo<>(companyUpdateLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyUpdateLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/sale/info/getCompanyUpdateLogOne") + public BaseResponse getCompanyUpdateLogOne(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { + filterCompanyUpdateLogRequest.setCustomerId(getCustomerId()); + filterCompanyUpdateLogRequest.setPage(1); + filterCompanyUpdateLogRequest.setLimit(1); + List companyUpdateLogEntities = companyUpdateLogService.filterCompanyUpdateLog(filterCompanyUpdateLogRequest); + if (companyUpdateLogEntities.size() > 0) { + CompanyUpdateLogEntity companyUpdateLogEntity = companyUpdateLogEntities.get(0); + return ResultVOUtils.success(companyUpdateLogEntity); + } + return ResultVOUtils.error(ResultEnum.DATA_NOT); + } + + @PostMapping("/sale/info/addCompanyUpdateLog") + public BaseResponse addCompanyUpdateLog(@RequestBody CompanyEntity companyEntity) { + String jsonStr = JSON.toJSONString(companyEntity); + JSONObject jsonObject = JSONObject.parseObject(jsonStr); + CompanyEntity tempCompanyEntity = JSON.toJavaObject(jsonObject, CompanyEntity.class); + return ResultVOUtils.success("添加成功"); + } + + @PostMapping("/sale/info/applyUpdate") + public BaseResponse applyUpdate(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { + CompanyEntity companyEntity = new CompanyEntity(); + companyEntity.setCustomerId(companyUpdateLogEntity.getCustomerId()); + companyEntity.setAuditStatus("4");//申请变更 + companyService.modifyCompany(companyEntity); + + companyUpdateLogEntity.setCreate_time(new Date()); + companyUpdateLogEntity.setStatus("1");//未审核 + companyUpdateLogEntity.setLogType("2");//变更审核 + boolean b = companyUpdateLogService.insertCompanyUpdateLog(companyUpdateLogEntity); + + return ResultVOUtils.success("提交成功"); + } + + @PostMapping("/sale/info/applyUpdateManage") + public BaseResponse applyUpdateManage(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { + CompanyEntity companyEntity = new CompanyEntity(); + companyEntity.setCustomerId(companyUpdateLogEntity.getCustomerId()); + String auditStatus = ""; + if (companyUpdateLogEntity.getStatus().equals("2")) { + auditStatus = "3";//允许变更 + } else { + auditStatus = "1";//通过（拒绝变更5恢复为通过） + } + companyEntity.setAuditStatus(auditStatus); + companyService.modifyCompany(companyEntity); + + companyUpdateLogEntity.setUpdate_time(new Date()); + boolean b = companyUpdateLogService.updateCompanyUpdateLog(companyUpdateLogEntity); + + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/insertCompanyUpdateLog") + public BaseResponse insertCompanyUpdateLog(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { + CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); +// companySalesmanEntity.setId(Integer.parseInt(String.valueOf(companyUpdateLogEntity.getSalesmanId()))); + companySalesmanEntity.setAuditStatus("4"); + companySalesmanEntity.setUpdate_time(new Date()); +// companySalesmanService.updateCompanySalesman(companySalesmanEntity); + companyUpdateLogEntity.setCreate_time(new Date()); + companyUpdateLogEntity.setUpdate_time(new Date()); + companyUpdateLogEntity.setStatus("1"); + boolean b = companyUpdateLogService.insertCompanyUpdateLog(companyUpdateLogEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/updateCompanyUpdateLog") + public BaseResponse updateCompanyUpdateLog(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { + CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); +// companySalesmanEntity.setId(Integer.parseInt(String.valueOf(companyUpdateLogEntity.getSalesmanId()))); + String auditStatus = ""; + if (companyUpdateLogEntity.getStatus().equals("2")) { + auditStatus = "3";//允许变更 + } else if (companyUpdateLogEntity.getStatus().equals("3")) { + auditStatus = "1";//通过（拒绝变更5恢复为通过） + } + companySalesmanEntity.setAuditStatus(auditStatus); + companySalesmanEntity.setUpdate_time(new Date()); +// companySalesmanService.updateCompanySalesman(companyCertEntity); + companyUpdateLogEntity.setUpdate_time(new Date()); + FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest = new FilterCompanyUpdateLogRequest(); + filterCompanyUpdateLogRequest.setPage(1); + filterCompanyUpdateLogRequest.setLimit(1); + filterCompanyUpdateLogRequest.setCustomerId(String.valueOf(companyUpdateLogEntity.getCustomerId())); + List companyUpdateLogEntities = + companyUpdateLogService.filterCompanyUpdateLog(filterCompanyUpdateLogRequest); + if (companyUpdateLogEntities.size() > 0) { + CompanyUpdateLogEntity tCompanyUpdateLogEntity = companyUpdateLogEntities.get(0); + companyUpdateLogEntity.setId(tCompanyUpdateLogEntity.getId()); + } + boolean b = companyUpdateLogService.updateCompanyUpdateLog(companyUpdateLogEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/sale/info/deleteCompanyUpdateLog") + public BaseResponse deleteCompanyUpdateLog(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = companyUpdateLogService.deleteById(deleteCompanyFileRequest.getId()); + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java new file mode 100644 index 0000000..806d924 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java @@ -0,0 +1,91 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.info.DeviceKeyEntity; +import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.info.DeviceKeyService; +import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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.security.MessageDigest; +import java.util.List; + +@RestController +public class DeviceKeyController { + + @Resource + DeviceKeyService deviceKeyService; + + @GetMapping("sale/device/registerList") + public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) { + List deviceKeyEntities = deviceKeyService.findDeviceKey(filterDeviceKeyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(deviceKeyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(deviceKeyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("sale/device/check") + public BaseResponse checkRegister(@RequestBody @Valid DeviceKeyEntity deviceKeyEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + deviceKeyEntity.setDate(DateUtil.getDate()); + deviceKeyService.updateDeviceKey(deviceKeyEntity); + return ResultVOUtils.success("审核成功"); + + } + + @PostMapping("/sale/info/registerKey") + public BaseResponse registerKey(@RequestBody DeviceKeyEntity deviceKeyEntity) { + String key = md5("glxp2020" + deviceKeyEntity.getImei()); + FilterDeviceKeyRequest filterDeviceKeyRequest = new FilterDeviceKeyRequest(); + filterDeviceKeyRequest.setImei(deviceKeyEntity.getImei()); + DeviceKeyEntity deviceKeyEntity1 = deviceKeyService.findDeviceByImei(filterDeviceKeyRequest); + if (deviceKeyEntity1 == null) { + deviceKeyEntity.setImeiKey(key); + deviceKeyEntity.setDate(DateUtil.getDate()); + deviceKeyEntity.setIsCheck(0); + deviceKeyService.insertDeviceKey(deviceKeyEntity); + } + if (deviceKeyEntity1.getIsCheck() != 0) + return ResultVOUtils.success(key); + else + return ResultVOUtils.success("0"); + } + + public String md5(String password) { + try { + MessageDigest digest = MessageDigest.getInstance("MD5"); + byte[] bytes = digest.digest(password.getBytes()); + StringBuilder sb = new StringBuilder(); + for (byte b : bytes) { + int c = b & 0xff; //负数转换成正数 + String result = Integer.toHexString(c); //把十进制的数转换成十六进制的书 + if (result.length() < 2) { + sb.append(0); //让十六进制全部都是两位数 + } + sb.append(result); + } + return sb.toString(); //返回加密后的密文 + } catch (Exception ex) { + ex.printStackTrace(); + return ""; + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java new file mode 100644 index 0000000..9bc190e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java @@ -0,0 +1,36 @@ +package com.glxp.sale.admin.controller.info; + +import com.glxp.sale.admin.entity.info.SetupEntity; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.service.info.SetupService; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 SetupController { + + @Resource + private SetupService setupService; + + @GetMapping("/sale/info/setup") + public BaseResponse getCompanyInfo(CompanyRequest companyRequest) { + SetupEntity setupEntity = setupService.findSetup(companyRequest.getCustomerId()+""); + if (setupEntity != null) { + return ResultVOUtils.success(setupEntity); + } + return ResultVOUtils.error(500, "设置信息为空"); + } + + @PostMapping("/sale/info/setup/modify") + public BaseResponse modifyCompany(@RequestBody SetupEntity setupEntity) { + setupService.insertSetup(setupEntity); + return ResultVOUtils.success("修改成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java new file mode 100644 index 0000000..0a3670a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java @@ -0,0 +1,113 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; +import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.CompanyRequest; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; +import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class SuppliersEnterpriseBasicCertController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SuppliersEnterpriseBasicCertService suppliersEnterpriseBasicCertService; + + @GetMapping("/udiwms/info/suppliers/enterprise/basic/cert/filter") + public BaseResponse filterCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List supplierEnterpriseBasicCertEntityList + = suppliersEnterpriseBasicCertService.filterCompanyCert(filterSuppliersEnterpriseBasicCertRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(supplierEnterpriseBasicCertEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(supplierEnterpriseBasicCertEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/info/suppliers/enterprise/basic/cert/companyCert") + public BaseResponse getCompanyCertInfo(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest) { + SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity = + suppliersEnterpriseBasicCertService.findCompanyCert(filterSuppliersEnterpriseBasicCertRequest.getEnterpriseId()); + if (supplierEnterpriseBasicCertEntity != null) { + return ResultVOUtils.success(supplierEnterpriseBasicCertEntity); + } + return ResultVOUtils.error(500, "空"); + } + + @GetMapping("/udiwms/info/suppliers/enterprise/basic/cert/getCompanyCert") + public BaseResponse getCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest) { +// filterSuppliersEnterpriseBasicCertRequest.setEnterpriseId(getCustomerId()); + List companyCertEntities = suppliersEnterpriseBasicCertService.getCompanyCert(filterSuppliersEnterpriseBasicCertRequest); + PageInfo pageInfo = new PageInfo<>(companyCertEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyCertEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/insertCompanyCert") + public BaseResponse insertCompanyCert(@RequestBody SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity) { + supplierEnterpriseBasicCertEntity.setCreate_time(new Date()); + supplierEnterpriseBasicCertEntity.setUpdate_time(new Date()); + boolean b = suppliersEnterpriseBasicCertService.insertCompanyCert(supplierEnterpriseBasicCertEntity); + return ResultVOUtils.success("成功"); + } + + @PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/updateCompanyCert") + public BaseResponse updateCompanyCert(@RequestBody SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity) { + + boolean b = suppliersEnterpriseBasicCertService.updateCompanyCert(supplierEnterpriseBasicCertEntity); + return ResultVOUtils.success("修改成功"); + } + + @PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/deleteCompanyCert") + public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = suppliersEnterpriseBasicCertService.deleteById(deleteCompanyFileRequest.getId()); + String URL="d:/1s/udiwms/register/file/image3/" + deleteCompanyFileRequest.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java new file mode 100644 index 0000000..2fb9609 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java @@ -0,0 +1,149 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.entity.auth.CustomerDetailEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; +import com.glxp.sale.admin.entity.info.SuppliersEnterpriseBasicEntity; +import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; +import com.glxp.sale.admin.req.info.SuppliersEnterpriseBasicRequest; +import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.impl.CustomerContactService; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicService; +import com.glxp.sale.admin.service.info.SuppliersRegistrationBasicService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class SuppliersEnterpriseBasicController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SuppliersEnterpriseBasicService suppliersEnterpriseBasicService; + @Resource + private SuppliersRegistrationBasicService suppliersRegistrationBasicService; + @Resource + private SuppliersEnterpriseBasicCertService suppliersEnterpriseBasicCertService; + + @GetMapping("/udiwms/info/suppliers/enterprise/basic/getCompanyInfo") + public BaseResponse getCompanyInfo(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest) { + SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity = suppliersEnterpriseBasicService.findCompany(suppliersEnterpriseBasicRequest.getId()); + if (suppliersEnterpriseBasicEntity != null) { + return ResultVOUtils.success(suppliersEnterpriseBasicEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @GetMapping("/udiwms/info/suppliers/enterprise/basic/getCompanyList") + public BaseResponse getCompanyList(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest) { +// suppliersEnterpriseBasicRequest.setId(suppliersEnterpriseBasicRequest.getId()); + List companyEntities = suppliersEnterpriseBasicService.getCompany(suppliersEnterpriseBasicRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/info/suppliers/enterprise/basic/addCompany") + public BaseResponse addCompany(@RequestBody SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity) { + suppliersEnterpriseBasicEntity.setCreateDate(new Date()); + suppliersEnterpriseBasicEntity.setUpdateDate(new Date()); + boolean b = suppliersEnterpriseBasicService.insertCompany(suppliersEnterpriseBasicEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @PostMapping("/udiwms/info/suppliers/enterprise/basic/modifyCompany") + public BaseResponse modifyCompany(@RequestBody SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity) { + suppliersEnterpriseBasicEntity.setUpdateDate(new Date()); + boolean b = suppliersEnterpriseBasicService.modifyCompany(suppliersEnterpriseBasicEntity); + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @GetMapping("/udiwms/info/suppliers/enterprise/basic/delete") + public BaseResponse deleteContact(DeleteRequest deleteRequest) { + FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest = + new FilterSuppliersEnterpriseBasicCertRequest(); + filterSuppliersEnterpriseBasicCertRequest.setEnterpriseId(Long.parseLong(deleteRequest.getId())); + List supplierEnterpriseBasicCertEntityList = + suppliersEnterpriseBasicCertService.getCompanyCert(filterSuppliersEnterpriseBasicCertRequest); + for (SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity : supplierEnterpriseBasicCertEntityList) { + if (StringUtils.isNotBlank(supplierEnterpriseBasicCertEntity.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image3/" + supplierEnterpriseBasicCertEntity.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + } + SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest = + new SuppliersRegistrationBasicRequest(); + suppliersRegistrationBasicRequest.setEnterpriseId(Long.parseLong(deleteRequest.getId())); + List suppliersRegistrationBasicEntityList = + suppliersRegistrationBasicService.getRegistration(suppliersRegistrationBasicRequest); + for (SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity : suppliersRegistrationBasicEntityList) { + if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getInstructions())) { + String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getInstructions(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + } + boolean b = suppliersEnterpriseBasicService.deleteById(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java new file mode 100644 index 0000000..517f26b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java @@ -0,0 +1,134 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.info.SuppliersRegistrationBasicService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +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 java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class SuppliersRegistrationBasicController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SuppliersRegistrationBasicService suppliersRegistrationBasicService; + + @GetMapping("/udiwms/info/suppliers/registration/basic/getRegistrationInfo") + public BaseResponse getRegistrationInfo(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest) { + SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity = suppliersRegistrationBasicService.findRegistration(suppliersRegistrationBasicRequest.getId()); + if (suppliersRegistrationBasicEntity != null) { + return ResultVOUtils.success(suppliersRegistrationBasicEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @GetMapping("/udiwms/info/suppliers/registration/basic/getRegistrationList") + public BaseResponse getRegistrationList(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest) { +// suppliersRegistrationBasicRequest.setId(suppliersRegistrationBasicRequest.getId()); + List companyEntities = suppliersRegistrationBasicService.getRegistration(suppliersRegistrationBasicRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/info/suppliers/registration/basic/addRegistration") + public BaseResponse addRegistration(@RequestBody SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity) { + suppliersRegistrationBasicEntity.setCreate_date(new Date()); + suppliersRegistrationBasicEntity.setUpdate_date(new Date()); + boolean b = suppliersRegistrationBasicService.insertRegistration(suppliersRegistrationBasicEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @PostMapping("/udiwms/info/suppliers/registration/basic/modifyRegistration") + public BaseResponse modifyRegistration(@RequestBody SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity) { + suppliersRegistrationBasicEntity.setUpdate_date(new Date()); + if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getNewFilePath())) { + if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + suppliersRegistrationBasicEntity.setFilePath(suppliersRegistrationBasicEntity.getNewFilePath()); + } + if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getNewInstructions())) { + if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getInstructions())) { + String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getInstructions(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + suppliersRegistrationBasicEntity.setInstructions(suppliersRegistrationBasicEntity.getNewInstructions()); + } + boolean b = suppliersRegistrationBasicService.modifyRegistration(suppliersRegistrationBasicEntity); + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @GetMapping("/udiwms/info/suppliers/registration/basic/delete") + public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) { + if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) { + String URL="d:/1s/udiwms/register/file/image4/" + deleteCompanyFileRequest.getFilePath(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath2())) { + String URL="d:/1s/udiwms/register/file/image4/" + deleteCompanyFileRequest.getFilePath2(); + File file=new File(URL); + if(file.exists()&&file.isFile()) { + file.delete(); + } + } + boolean b = suppliersRegistrationBasicService.deleteById(deleteCompanyFileRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java new file mode 100644 index 0000000..58ca810 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java @@ -0,0 +1,108 @@ +package com.glxp.sale.admin.controller.param; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.req.param.SystemParamConfigRequest; +import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.param.SystemParamConfigResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +public class SystemParamConfigController { + + @Resource + private SystemParamConfigService systemParamConfigService; + + @AuthRuleAnnotation("system/param/config/list") + @GetMapping("/system/param/config/list") + public BaseResponse list(@Valid SystemParamConfigRequest systemParamConfigRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + systemParamConfigRequest.setParamStatus(1); + List systemParamConfigEntityList = systemParamConfigService.queryPage(systemParamConfigRequest); + List systemParamConfigResponseList = systemParamConfigEntityList.stream().map(item -> { + SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); + BeanUtils.copyProperties(item, systemParamConfigResponse); + return systemParamConfigResponse; + }).collect(Collectors.toList()); + + PageInfo pageInfo = new PageInfo<>(systemParamConfigEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(systemParamConfigResponseList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("system/param/config/save") + @PostMapping("/system/param/config/save") + public BaseResponse save(@RequestBody @Valid SystemParamConfigSaveRequest systemParamConfigSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity(); + BeanUtils.copyProperties(systemParamConfigSaveRequest, systemParamConfigEntity); + + boolean b = systemParamConfigService.insert(systemParamConfigEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + @AuthRuleAnnotation("system/param/config/update") + @PostMapping("/system/param/config/update") + public BaseResponse update(@RequestBody SystemParamConfigSaveRequest systemParamConfigSaveRequest) { +// systemParamConfigSaveRequest.setId(1); + systemParamConfigService.updateById(systemParamConfigSaveRequest); + if (systemParamConfigSaveRequest.getParentId() == 0) { + SystemParamConfigSaveRequest systemParamConfigSaveRequest1 = new SystemParamConfigSaveRequest(); + systemParamConfigSaveRequest1.setParentId(systemParamConfigSaveRequest.getId()); + if (systemParamConfigSaveRequest.getParamValue().equals("1")) { + systemParamConfigSaveRequest1.setParamStatus(1); + } else { + systemParamConfigSaveRequest1.setParamStatus(0); + } + systemParamConfigService.updateParentId(systemParamConfigSaveRequest1); + } + return ResultVOUtils.success("修改成功"); + } + + + //key搜索 + @GetMapping("/udiwms/sys/config/selectByKey") + public BaseResponse selectByKey(@Valid SystemParamConfigRequest systemParamConfigRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(systemParamConfigRequest.getParamKey()); + return ResultVOUtils.success(systemParamConfigEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/CorpImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/CorpImportLogController.java new file mode 100644 index 0000000..368f300 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/CorpImportLogController.java @@ -0,0 +1,143 @@ +package com.glxp.sale.admin.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.entity.sync.CorpImportDetailEntity; +import com.glxp.sale.admin.entity.sync.CorpImportLogEntity; +import com.glxp.sale.admin.http.PostSmpHttp; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.req.sync.PostCorpsRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.CorpImportDetailService; +import com.glxp.sale.admin.service.sync.CorpImportLogService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@RestController +public class CorpImportLogController { + @Resource + CorpImportLogService corpImportLogService; + @Resource + CorpImportDetailService corpImportDetailService; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + PostSmpHttp postSmpHttp; + + @GetMapping("/udiwms/corps/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportLogEntities + = corpImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/corps/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List corpImportDetailEntities + = corpImportDetailService.filterCorpImport(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(corpImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(corpImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/corps/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List corpImportLogEntities = corpImportLogService.filterImportLog(filterInCodeLogRequest); + if (corpImportLogEntities != null && corpImportLogEntities.size() > 0) { + CorpImportLogEntity corpImportLogEntity = corpImportLogEntities.get(0); + corpImportLogService.deleteById(corpImportLogEntity.getId() + ""); + corpImportDetailService.deleteByGenkey(corpImportLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/corps/importLog/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (corpImportDetailService.deleteById(deleteRequest.getId())) + return ResultVOUtils.success("删除成功"); + else + return ResultVOUtils.error(500, "删除成功"); + } + + + //往来单位信息接口上传 + @PostMapping("/udiwms/basic/corps/upload") + public BaseResponse postUdiInfo(@RequestBody PostCorpsRequest postCorpsRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("enable_direct"); + if (systemParamConfigEntity.getParamValue().equals("1")) { + return postSmpHttp.postCorp(postCorpsRequest); + } else { + String genKey = postCorpsRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + CorpImportLogEntity corpImportLogEntity = corpImportLogService.selectByGenKey(genKey); + List corpImportDetailEntities = postCorpsRequest.getDatas(); + if (corpImportDetailEntities != null) { + for (CorpImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { + corpImportDetailEntity.setGenKeyFk(genKey); + corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + corpImportDetailEntity.setUpdateTime(new Date()); + corpImportDetailService.insertCorpImport(corpImportDetailEntity); + } + } + if (corpImportLogEntity == null) { + corpImportLogEntity = new CorpImportLogEntity(); + corpImportLogEntity.setGenKey(genKey); + corpImportLogEntity.setFromType("接口上传"); + corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + corpImportLogService.insertImportLog(corpImportLogEntity); + } else { + corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + corpImportLogService.updateImportLog(corpImportLogEntity); + } + return ResultVOUtils.success("上传成功"); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java new file mode 100644 index 0000000..7b03e31 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/IOOrderStatusController.java @@ -0,0 +1,102 @@ +package com.glxp.sale.admin.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.sync.ErpOrderEntity; +import com.glxp.sale.admin.entity.sync.IOOrderStatusEntity; +import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.OrderStatusFilterRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.DlOrderResponse; +import com.glxp.sale.admin.service.sync.CodesService; +import com.glxp.sale.admin.service.sync.IOOrderStatusService; +import com.glxp.sale.admin.service.sync.OrderDetailService; +import com.glxp.sale.admin.service.sync.OrderService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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.List; + +@RestController +public class IOOrderStatusController { + + @Resource + private OrderService orderService; + @Resource + private CodesService codesService; + @Resource + private OrderDetailService orderDetailService; + @Resource + private IOOrderStatusService ioOrderStatusService; + + @GetMapping("spms/inout/order/status") + public BaseResponse listOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) { + List orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderStatusEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderStatusEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("spms/inout/order/dlByStatus") + public BaseResponse dlByStatus(OrderStatusFilterRequest orderStatusFilterRequest) { + List dlOrderResponses = new ArrayList<>(); + List orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest); + if (orderStatusEntities != null && orderStatusEntities.size() > 0) { + for (IOOrderStatusEntity orderStatusEntity : orderStatusEntities) { + DlOrderResponse dlOrderResponse = new DlOrderResponse(); + OrderEntity orderEntity = orderService.findById(orderStatusEntity.getOrderId()); + dlOrderResponse.setOrderEntity(orderEntity); + List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderStatusEntity.getOrderId()); + dlOrderResponse.setOrderDetails(orderDetailEntityList); + List codes = codesService.findByReceiptId(orderStatusEntity.getOrderId()); + dlOrderResponse.setCodes(codes); + dlOrderResponses.add(dlOrderResponse); + } + } + return ResultVOUtils.success(dlOrderResponses); + } + + //更新订单 + @PostMapping("/spms/inout/order/deleteStatus") + public BaseResponse deleteStatus(@RequestBody OrderStatusFilterRequest orderStatusFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = ioOrderStatusService.deleteByOrderId(orderStatusFilterRequest.getOrderId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("更新成功"); + } + + @PostMapping("/spms/inout/order/updateStatus") + public BaseResponse updateStatus(@RequestBody IOOrderStatusEntity orderStatusFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = ioOrderStatusService.updateOrderStatus(orderStatusFilterRequest); + if (orderStatusFilterRequest.getStatus() == 2) { + orderService.deleteByOrderId(orderStatusFilterRequest.getOrderId()); + } + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("更新成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/ThrOrderImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/ThrOrderImportLogController.java new file mode 100644 index 0000000..09d6e8f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/ThrOrderImportLogController.java @@ -0,0 +1,172 @@ +package com.glxp.sale.admin.controller.sync; + + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.entity.sync.ThrOrderImportDetailEntity; +import com.glxp.sale.admin.entity.sync.ThrOrderImportLogEntity; +import com.glxp.sale.admin.http.PostSmpHttp; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.req.sync.PostThrOrderRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.ErpOrderResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.ThrOrderImportDetailService; +import com.glxp.sale.admin.service.sync.ThrOrderImportLogService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class ThrOrderImportLogController { + + @Resource + ThrOrderImportLogService thrOrderImportLogService; + @Resource + ThrOrderImportDetailService thrOrderImportDetailService; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + PostSmpHttp postSmpHttp; + + @GetMapping("/udiwms/thrOrder/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportLogEntities + = thrOrderImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/thrOrder/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrOrderImportDetailEntities + = thrOrderImportDetailService.filterOrderImportDetail(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrOrderImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrOrderImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/thrOrder/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List corpImportLogEntities = thrOrderImportLogService.filterImportLog(filterInCodeLogRequest); + if (corpImportLogEntities != null && corpImportLogEntities.size() > 0) { + ThrOrderImportLogEntity corpImportLogEntity = corpImportLogEntities.get(0); + thrOrderImportLogService.deleteById(corpImportLogEntity.getId() + ""); + thrOrderImportDetailService.deleteByGenkey(corpImportLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/thrOrder/importLog/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (thrOrderImportDetailService.deleteById(deleteRequest.getId())) + return ResultVOUtils.success("删除成功"); + else + return ResultVOUtils.error(500, "删除成功"); + } + + + //第三方业务单据上传 + @PostMapping("/udiwms/thrsys/postOrderDetail") + public BaseResponse postOrderDetail(@RequestBody PostThrOrderRequest postThrOrderRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("enable_direct"); + if (systemParamConfigEntity.getParamValue().equals("1")) { + return postSmpHttp.postOrder(postThrOrderRequest); + } else { + String genKey = postThrOrderRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); + if (thrOrderImportLogEntity == null) { + thrOrderImportLogEntity = new ThrOrderImportLogEntity(); + thrOrderImportLogEntity.setGenKey(genKey); + thrOrderImportLogEntity.setFromType("UDI管理系统上传"); + thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + thrOrderImportLogEntity.setUpdateTime(new Date()); + thrOrderImportLogEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); + thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity); + } + List erpOrderResponses = postThrOrderRequest.getDatas(); + if (erpOrderResponses != null && erpOrderResponses.size() > 0) { + List thrOrderImportDetailEntities = new ArrayList<>(); + String finalGenKey = genKey; + for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { + List subErpOrders = erpOrderResponse.getSubErpOrders(); + if (subErpOrders != null && subErpOrders.size() > 0) { + for (ErpOrderResponse.SubErpOrder subErpOrder : subErpOrders) { + ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); + BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity); + BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); + thrOrderDetailEntity.setGenKeyFk(finalGenKey); + thrOrderDetailEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); + thrOrderDetailEntity.setUpdateTime(new Date()); + thrOrderImportDetailEntities.add(thrOrderDetailEntity); + } + + } + } + thrOrderImportDetailService.insertOrderImportDetails(thrOrderImportDetailEntities); + thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + thrOrderImportLogEntity.setUpdateTime(new Date()); + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); + } else { + thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrOrderImportLogEntity.setUpdateTime(new Date()); + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); + return ResultVOUtils.error(500, "上传数据为空"); + } + return ResultVOUtils.success("单据上传成功！"); + } + + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/ThrProductsImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/ThrProductsImportLogController.java new file mode 100644 index 0000000..3a28df0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/ThrProductsImportLogController.java @@ -0,0 +1,143 @@ +package com.glxp.sale.admin.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.entity.sync.ThrProductsImportDetailEntity; +import com.glxp.sale.admin.entity.sync.ThrProductsImportLogEntity; +import com.glxp.sale.admin.http.PostSmpHttp; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.req.sync.PostThrProductsRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.ErpProductsResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.ThrProductsImportDetailService; +import com.glxp.sale.admin.service.sync.ThrProductsImportLogService; +import com.glxp.sale.admin.thread.DataImportService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@RestController +public class ThrProductsImportLogController { + + @Resource + ThrProductsImportLogService thrProductsImportLogService; + @Resource + ThrProductsImportDetailService thrProductsImportDetailService; + @Resource + DataImportService dataImportService; + @Resource + PostSmpHttp postSmpHttp; + @Resource + SystemParamConfigService systemParamConfigService; + + @GetMapping("/udiwms/thrProducts//importLog/filter") + + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsImportLogEntities + = thrProductsImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/thrProducts/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsImportDetailEntities + = thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrProducts//importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List thrProductsImportLogEntities = thrProductsImportLogService.filterImportLog(filterInCodeLogRequest); + if (thrProductsImportLogEntities != null && thrProductsImportLogEntities.size() > 0) { + ThrProductsImportLogEntity thrInvProductsImportLogEntity = thrProductsImportLogEntities.get(0); + thrProductsImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + ""); + thrProductsImportDetailService.deleteByGenkey(thrInvProductsImportLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + //第三方产品信息接口上传 + @PostMapping("/udiwms/thrsys/postThrProducts") + public BaseResponse postThrProducts(@RequestBody PostThrProductsRequest postThrProductsRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String value = systemParamConfigService.selectValueByParamKey("enable_direct"); + if ("1".equals(value)) { + return postSmpHttp.postThrProducts(postThrProductsRequest); + } else { + + List erpProductsResponses = postThrProductsRequest.getDatas(); + + String genKey = postThrProductsRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); + if (thrProductsImportLogEntity == null) { + thrProductsImportLogEntity = new ThrProductsImportLogEntity(); + thrProductsImportLogEntity.setGenKey(genKey); + if (postThrProductsRequest.getUploadType() != null) { + thrProductsImportLogEntity.setFromType(postThrProductsRequest.getUploadType()); + } else + thrProductsImportLogEntity.setFromType("供应商平台上传"); + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogEntity.setThirdSysFk(postThrProductsRequest.getThirdSys()); + thrProductsImportLogService.insertImportLog(thrProductsImportLogEntity); + } + + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + dataImportService.insertData(genKey, erpProductsResponses, postThrProductsRequest.getThirdSys()); + return ResultVOUtils.success("产品信息上传成功！"); + } + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogEntity.setRemark("上传数据为空"); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); + return ResultVOUtils.error(500, "上传数据为空"); + + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiInfoImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiInfoImportLogController.java new file mode 100644 index 0000000..65df53a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiInfoImportLogController.java @@ -0,0 +1,258 @@ +package com.glxp.sale.admin.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.entity.sync.UdiInfoImportDetailEntity; +import com.glxp.sale.admin.entity.sync.UdiInfoImportLogEntity; +import com.glxp.sale.admin.http.PostSmpHttp; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.sync.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.req.sync.PostUdiInfoRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.UdiInfoImportDetailService; +import com.glxp.sale.admin.service.sync.UdiInfoImportLogService; +import com.glxp.sale.admin.thread.DataImportService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Date; +import java.util.ArrayList; +import java.util.List; + +/** + * 医疗器械信息导入 + */ + +@RestController +public class UdiInfoImportLogController { + + @Resource + UdiInfoImportLogService udiInfoImportLogService; + @Resource + UdiInfoImportDetailService udiInfoImportService; + @Resource + PostSmpHttp postSmpHttp; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + DataImportService dataImportService; + + @GetMapping("/udiwms/products/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportLogEntities + = udiInfoImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/products/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportEntities + = udiInfoImportService.filterUdiInfoImport(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/products/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List importLogEntities = udiInfoImportLogService.filterImportLog(filterInCodeLogRequest); + if (importLogEntities != null && importLogEntities.size() > 0) { + UdiInfoImportLogEntity importLogEntity = importLogEntities.get(0); + udiInfoImportLogService.deleteById(importLogEntity.getId() + ""); + udiInfoImportService.deleteByGenkey(importLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/products/importLog/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (udiInfoImportService.deleteById(deleteRequest.getId())) + return ResultVOUtils.success("删除成功"); + else + return ResultVOUtils.error(500, "删除成功"); + } + + //产品信息接口上传 + @PostMapping("/udiwms/basic/products/upload") + public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + String value = systemParamConfigService.selectValueByParamKey("enable_direct"); + if ("1".equals(value)) { + return postSmpHttp.postUdiInfo(postUdiInfoRequest); + } else { + String genKey = postUdiInfoRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); + List udiInfoImportEntities = postUdiInfoRequest.getDatas(); + if (udiInfoImportEntities != null) { + for (UdiInfoImportDetailEntity udiInfoImportEntity : udiInfoImportEntities) { + udiInfoImportEntity.setGenKeyFk(genKey); + udiInfoImportEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + udiInfoImportEntity.setUpdateTime(new java.util.Date()); + udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); + } + } + if (udiInfoImportLogEntity == null) { + udiInfoImportLogEntity = new UdiInfoImportLogEntity(); + udiInfoImportLogEntity.setGenKey(genKey); + udiInfoImportLogEntity.setDataType(BasicProcessStatus.DATA_TYPE_UDI); + udiInfoImportLogEntity.setFromType("接口上传"); + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); + } else { + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } + return ResultVOUtils.success("上传成功"); + } + + + } + + + //产品信息接口上传 + @PostMapping("/spms/basic/products/upload") + public BaseResponse uploadUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + String value = systemParamConfigService.selectValueByParamKey("enable_direct"); + if ("1".equals(value)) { + return postSmpHttp.postUdiInfo(postUdiInfoRequest); + } else { + String genKey = postUdiInfoRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); + List udiInfoImportEntities = postUdiInfoRequest.getDatas(); + if (udiInfoImportEntities != null) { + for (UdiInfoImportDetailEntity udiInfoImportEntity : udiInfoImportEntities) { + udiInfoImportEntity.setGenKeyFk(genKey); + udiInfoImportEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + udiInfoImportEntity.setUpdateTime(new java.util.Date()); + udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); + } + } + if (udiInfoImportLogEntity == null) { + udiInfoImportLogEntity = new UdiInfoImportLogEntity(); + udiInfoImportLogEntity.setGenKey(genKey); + udiInfoImportLogEntity.setDataType(BasicProcessStatus.DATA_TYPE_SP); + udiInfoImportLogEntity.setFromType("接口上传"); + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); + } else { + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } + return ResultVOUtils.success("上传成功"); + } + + + } + + //产品信息下载 + @GetMapping("/udiwms/basic/products/download") + public BaseResponse filterBsaicProducts(FilterUdiInfoRequest filterUdiInfoRequest) { + + String value = systemParamConfigService.selectValueByParamKey("enable_direct"); + if ("1".equals(value)) { + return postSmpHttp.getUdiInfo(filterUdiInfoRequest); + } else { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + BeanUtils.copyProperties(filterUdiInfoRequest, filterUdiIpLogRequest); + List udiInfoImportDetailEntities = udiInfoImportService.filterUdiInfoImport(filterUdiIpLogRequest); + if (udiInfoImportDetailEntities != null && udiInfoImportDetailEntities.size() > 0) { + for (UdiInfoImportDetailEntity udiInfoImportDetailEntity : udiInfoImportDetailEntities) { + udiInfoImportDetailEntity.setNameCode(udiInfoImportDetailEntity.getUdiCode()); + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + } + + + //供应商平台产品信息下载 + @GetMapping("/udiwms/products/smp/download") + public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String genKey = CustomUtil.getId(); + UdiInfoImportLogEntity udiInfoImportLogEntity = new UdiInfoImportLogEntity(); + udiInfoImportLogEntity.setGenKey(genKey); + udiInfoImportLogEntity.setFromType("供应商平台下载"); + udiInfoImportLogEntity.setDataType(BasicProcessStatus.DATA_TYPE_SP); + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + udiInfoImportLogEntity.setUpdateTime(new java.util.Date()); + udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); + dataImportService.downloadSmpUdiInfo(genKey, filterUdiIpLogRequest.getLastUpdateTime()); + return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!"); + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java new file mode 100644 index 0000000..74fc40a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java @@ -0,0 +1,184 @@ +package com.glxp.sale.admin.controller.sync; + +import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.entity.sync.*; +import com.glxp.sale.admin.http.PostSmpHttp; +import com.glxp.sale.admin.req.sync.*; +import com.glxp.sale.admin.res.sync.ErpOrderResponse; +import com.glxp.sale.admin.res.sync.ErpProductsResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.*; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * //本地上传供应商平台 + */ + +@RestController +public class UdiwmsPostDirectController { + + + @Resource + PostSmpHttp postSmpHttp; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + UdiInfoImportLogService udiInfoImportLogService; + @Resource + UdiInfoImportDetailService udiInfoImportDetailService; + @Resource + CorpImportLogService corpImportLogService; + @Resource + CorpImportDetailService corpImportDetailService; + @Resource + ThrOrderImportLogService thrOrderImportLogService; + @Resource + ThrOrderImportDetailService orderImportDetailService; + @Resource + ThrProductsImportLogService thrProductsImportLogService; + @Resource + ThrProductsImportDetailService thrProductsImportDetailService; + + @PostMapping("/udisp/sync/postUdiInfo") + public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(postUdiInfoRequest.getGenKey()); + List udiInfoImportDetailEntityList = udiInfoImportDetailService.filterUdiInfoImport(filterUdiIpLogRequest); + PostUdiInfoRequest postUdiInfoRequest1 = new PostUdiInfoRequest(); + postUdiInfoRequest1.setDatas(udiInfoImportDetailEntityList); + BaseResponse baseResponse = postSmpHttp.postUdiInfo(postUdiInfoRequest1); + UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(postUdiInfoRequest.getGenKey()); + if (baseResponse.getCode() == 20000) { + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + } else { + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + } + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + return baseResponse; + } + + + @PostMapping("/udisp/sync/postCorp") + public BaseResponse postCorp(@RequestBody PostUdiInfoRequest postUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(postUdiInfoRequest.getGenKey()); + List corpImportDetailEntities = corpImportDetailService.filterCorpImport(filterUdiIpLogRequest); + PostCorpsRequest postCorpsRequest = new PostCorpsRequest(); + postCorpsRequest.setDatas(corpImportDetailEntities); + + + BaseResponse baseResponse = postSmpHttp.postCorp(postCorpsRequest); + CorpImportLogEntity corpImportLogEntity = corpImportLogService.selectByGenKey(postUdiInfoRequest.getGenKey()); + if (baseResponse.getCode() == 20000) { + corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + } else { + corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + } + corpImportLogService.updateImportLog(corpImportLogEntity); + return baseResponse; + } + + @PostMapping("/udisp/sync/postOrder") + public BaseResponse postOrder(@RequestBody PostUdiInfoRequest postUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(postUdiInfoRequest.getGenKey()); + List thrOrderImportDetailEntities = orderImportDetailService.filterOrderImportDetail(filterUdiIpLogRequest); + List erpOrderResponses = new ArrayList<>(); + if (thrOrderImportDetailEntities != null && thrOrderImportDetailEntities.size() > 0) { + Map> map = thrOrderImportDetailEntities.stream().collect(Collectors.groupingBy(ThrOrderImportDetailEntity::getBillNo)); + for (List datas : map.values()) { + ThrOrderImportDetailEntity thrOrderImportDetailEntity = datas.get(0); + ErpOrderResponse thrOrderEntity = new ErpOrderResponse(); + BeanUtils.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); + List postDatas = datas.stream().map(item -> + { + ErpOrderResponse.SubErpOrder thrOrderDetailEntity = new ErpOrderResponse.SubErpOrder(); + BeanUtils.copyProperties(item, thrOrderDetailEntity); + return thrOrderDetailEntity; + }).collect(Collectors.toList()); + thrOrderEntity.setSubErpOrders(postDatas); + erpOrderResponses.add(thrOrderEntity); + } + } + + PostThrOrderRequest postUdiInfoRequest1 = new PostThrOrderRequest(); + postUdiInfoRequest1.setDatas(erpOrderResponses); + ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(postUdiInfoRequest.getGenKey()); + BaseResponse baseResponse = postSmpHttp.postOrder(postUdiInfoRequest1); + if (baseResponse.getCode() == 20000) { + thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + } else { + thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + } + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); + return baseResponse; + + } + + @PostMapping("/udisp/sync/postProducts") + public BaseResponse postProducts(@RequestBody PostUdiInfoRequest postUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(postUdiInfoRequest.getGenKey()); + List thrProductsImportDetailEntities = thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); + List erpProductsResponses = thrProductsImportDetailEntities.stream().map(item -> + { + ErpProductsResponse erpProductsResponse = new ErpProductsResponse(); + BeanUtils.copyProperties(item, erpProductsResponse); + erpProductsResponse.setThirdSys(item.getThirdSysFk()); + return erpProductsResponse; + }).collect(Collectors.toList()); + + PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest(); + postThrProductsRequest.setDatas(erpProductsResponses); + postThrProductsRequest.setThirdSys(erpProductsResponses.get(0).getThirdSys()); + ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(postUdiInfoRequest.getGenKey()); + BaseResponse baseResponse = postSmpHttp.postThrProducts(postThrProductsRequest); + if (baseResponse.getCode() == 20000) { + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + } else { + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + } + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); + return baseResponse; + + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdplatGoodsImportController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdplatGoodsImportController.java new file mode 100644 index 0000000..c149891 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdplatGoodsImportController.java @@ -0,0 +1,55 @@ +package com.glxp.sale.admin.controller.sync; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.sync.ThrImportLogEntity; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.sync.ThrImportLogService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("thr/order/import") +public class UdplatGoodsImportController { + @Resource + ThrImportLogService thrImportLogService; + + + @GetMapping("/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsImportLogEntities + = thrImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrImportLogService.deleteById(id + ""); + + return ResultVOUtils.success("删除成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java new file mode 100644 index 0000000..8222727 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java @@ -0,0 +1,71 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.UpdateUserflagBean; +import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface AuthAdminDao { + + /** + * 后台业务查询列表 + * + * @return 列表 + */ + List 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); + + AuthAdmin findByUser(@Param("userName") String userName,@Param("CustomerId") String CustomerId); + + + /** + * 插入 + * + * @param authAdmin + * @return + */ + boolean insertAuthAdmin(AuthAdmin authAdmin); + + /** + * 更新 + * + * @param authAdmin + * @return + */ + boolean updateAuthAdmin(AuthAdmin authAdmin); + + /** + * 删除 + * + * @param id + * @return + */ + boolean deleteById(Long id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthPermissionDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthPermissionDao.java new file mode 100644 index 0000000..80e3046 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthPermissionDao.java @@ -0,0 +1,40 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.AuthPermission; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface AuthPermissionDao { + + /** + * 根据roleIds查询 + * @param roleIds 传入的id + * @return + */ + List listByRoleIdIn(List roleIds); + + /** + * 根据 roleId 查询 + * @param roleId 传入的id + * @return + */ + List listByRoleId(Long roleId); + + + /** + * 批量插入 + * @param authPermissionList + * @return + */ + int insertAuthPermissionAll(List authPermissionList); + + /** + * 根据角色id删除 + * @param roleId + * @return + */ + boolean deleteByRoleId(Long roleId); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthPermissionRuleDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthPermissionRuleDao.java new file mode 100644 index 0000000..f01f2af --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthPermissionRuleDao.java @@ -0,0 +1,61 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface AuthPermissionRuleDao { + + /** + * 根据ids查询 规则名称 + * @param ids 传入的ids + * @return + */ + List listByIdIn(List ids); + + /** + * 查询所有 + * @param map + * @return + */ + List listAll(); + + /** + * 根据 父级 pid 查询 + * @param pid + * @return + */ + List 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); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleAdminDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleAdminDao.java new file mode 100644 index 0000000..6840c8e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleAdminDao.java @@ -0,0 +1,56 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface AuthRoleAdminDao { + + /** + * 根据 adminId 查询 + * + * @param adminId 传入的 adminId + * @return + */ + List listByAdminId(Long adminId); + + /** + * 根据 多个 adminId 查询 + * + * @param adminIds 传入的 adminIds + * @return + */ + List listByAdminIdIn(List adminIds); + + /** + * 根据 role_id 查询 admin_id + * + * @param roleId 传入的 roleId + * @return + */ + List listByRoleId(Long roleId); + + /** + * 批量插入 + * + * @param authRoleAdminList + * @return + */ + int insertAuthRoleAdminAll(List authRoleAdminList); + + + /** + * 根据 adminId 删除 + * + * @param adminId + * @return + */ + boolean deleteByAdminId(Long adminId); + + + List listAdminRole(Long adminId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java new file mode 100644 index 0000000..b4a3257 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java @@ -0,0 +1,52 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface AuthRoleDao { + + /** + * 后台管理业务查询列表 + * @return 列表 + */ + List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest); + + /** + * 返回id,name 字段的列表 + * @return 列表 + */ + List listAuthAdminRolePage(@Param("status") Integer status); + + List listCustomerRoles(Integer isCustomer); + + List listAuthRoles2(); + + 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); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerContacDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerContacDao.java new file mode 100644 index 0000000..983c923 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerContacDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.req.auth.CustomerContactFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CustomerContacDao { + + List filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest); + + boolean insertCustomerContact(CustomerContactEntity customerContactEntity); + + boolean updateCustomerContact(CustomerContactEntity customerContactEntity); + + boolean deleteById(Long customerId); + + CustomerContactEntity selectById(Long customerId); + + boolean deleteContact(DeleteRequest deleteRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java new file mode 100644 index 0000000..461f1a2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.CustomerDetailEntity; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; +import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CustomerInfoDao { + + + List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); + List 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); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java new file mode 100644 index 0000000..259259a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/UserRegisterDao.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.dao.auth; + +import com.glxp.sale.admin.entity.auth.UserRegisterEntity; +import com.glxp.sale.admin.req.auth.UserResisterFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UserRegisterDao { + + List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest); + + boolean insertUserRegister(UserRegisterEntity userRegisterEntity); + + boolean updateUserRegister(UserRegisterEntity userRegisterEntity); + + boolean deleteById(Long id); + + UserRegisterEntity selectById(Integer id); + + UserRegisterEntity selectByCustomerId(Long id); + + UserRegisterEntity selectByMobile(String phone); + + boolean deleteByCustomerId(Long id); + + String isExit(String phoneNum); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/AliCertDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/AliCertDao.java new file mode 100644 index 0000000..146a191 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/AliCertDao.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.AliCertEntity; +import com.glxp.sale.admin.req.info.DeleteAliCertRequest; +import com.glxp.sale.admin.req.info.FilterAliCertRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface AliCertDao { + + boolean insertAliCert(AliCertEntity aliCertEntity); + + boolean insertAliCertList(@Param("aliCertEntities") List aliCertEntities); + + List filterAliCert(FilterAliCertRequest filterAliCertRequest); + + boolean deleteAliCert(DeleteAliCertRequest deleteAliCertRequest); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ApilogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ApilogDao.java new file mode 100644 index 0000000..5c135ab --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ApilogDao.java @@ -0,0 +1,17 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.ApilogEntity; +import com.glxp.sale.admin.req.info.DeleteApilogRequest; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ApilogDao { + + boolean insertApilog(ApilogEntity apilogEntity); + + boolean updateApilog(ApilogEntity apilogEntity); + + boolean deleteApilog(DeleteApilogRequest deleteApilogRequest); + + boolean addApilog(ApilogEntity apilogEntity); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java new file mode 100644 index 0000000..a28716d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanyCertDao { + + List filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest); + + CompanyCertEntity findCompanyCert(Long CustomerId); + + CompanyCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest); + + boolean updateCompanyCert(CompanyCertEntity companyCertEntity); + + boolean insertCompanyCert(CompanyCertEntity companyCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java new file mode 100644 index 0000000..5b979da --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.AliKeyEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.req.info.FilterCompanyRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanyDao { + + CompanyEntity findCompany(Long CustomerId); + + CompanyEntity findCompanyByName(String companyName); + + List getSubCompany(FilterCompanyRequest companyRequest); + + List getSubCompany2(FilterCompanyRequest companyRequest); + + boolean modifyCompany(CompanyEntity companyEntity); + + boolean insertCompany(CompanyEntity companyEntity); + + AliKeyEntity findKey(String customerId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java new file mode 100644 index 0000000..33b445b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanySalesmanDao { + + List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + CompanySalesmanEntity findCompanySalesman(Long CustomerId); + + CompanySalesmanEntity findCompanySalesmanByName(String name); + + List getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + boolean updateCompanySalesman(CompanySalesmanEntity companySalesmanEntity); + + boolean insertCompanySalesman(CompanySalesmanEntity companySalesmanEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java new file mode 100644 index 0000000..9d022ef --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.CompanySalesmanUpdateLogEntity; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanUpdateLogRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanySalesmanUpdateLogDao { + + List filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest); + + CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId); + + CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit); + + List getCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest); + + boolean updateCompanySalesmanUpdateLog(CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity); + + boolean insertCompanySalesmanUpdateLog(CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java new file mode 100644 index 0000000..5bc23d4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.CompanyUpdateLogEntity; +import com.glxp.sale.admin.req.info.FilterCompanyUpdateLogRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CompanyUpdateLogDao { + + List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId); + + CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit); + + List getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/DeviceKeyDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/DeviceKeyDao.java new file mode 100644 index 0000000..e79e941 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/DeviceKeyDao.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.DeviceKeyEntity; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DeviceKeyDao { + DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest); + + List findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest); + + void insertDeviceKey(DeviceKeyEntity deviceKeyEntity); + + void updateDeviceKey(DeviceKeyEntity deviceKeyEntity); + void updateDeviceKeyByImei(DeviceKeyEntity deviceKeyEntity); + void deleteDeviceKey(DeleteRequest deleteRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ScheduledDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ScheduledDao.java new file mode 100644 index 0000000..351c7de --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ScheduledDao.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.ScheduledEntity; +import com.glxp.sale.admin.req.info.ScheduledRequest; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ScheduledDao { + + ScheduledEntity findScheduled(ScheduledRequest scheduledRequest); + + boolean modifyScheduled(ScheduledEntity scheduledEntity); + + boolean insertScheduled(ScheduledEntity scheduledEntity); + + boolean deleteScheduled(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SetupDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SetupDao.java new file mode 100644 index 0000000..5b47789 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SetupDao.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.SetupEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SetupDao { + + SetupEntity findSetup(String customerId); + + boolean modifySetup(SetupEntity setupEntity); + + boolean insertSetup(SetupEntity setupEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersEnterpriseBasicCertDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersEnterpriseBasicCertDao.java new file mode 100644 index 0000000..3cb74ac --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersEnterpriseBasicCertDao.java @@ -0,0 +1,28 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; +import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SuppliersEnterpriseBasicCertDao { + + List filterCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest); + + SupplierEnterpriseBasicCertEntity findCompanyCert(Long enterpriseId); + + SupplierEnterpriseBasicCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest); + + boolean updateCompanyCert(SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity); + + boolean insertCompanyCert(SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity); + + boolean deleteById(String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersEnterpriseBasicDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersEnterpriseBasicDao.java new file mode 100644 index 0000000..90f0d54 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersEnterpriseBasicDao.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.SuppliersEnterpriseBasicEntity; +import com.glxp.sale.admin.req.info.SuppliersEnterpriseBasicRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SuppliersEnterpriseBasicDao { + + SuppliersEnterpriseBasicEntity findCompany(Long id); + + SuppliersEnterpriseBasicEntity findCompanyByName(String companyName); + + List getCompany(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest); + + boolean modifyCompany(SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity); + + boolean insertCompany(SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersRegistrationBasicDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersRegistrationBasicDao.java new file mode 100644 index 0000000..a5d7371 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/SuppliersRegistrationBasicDao.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; +import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SuppliersRegistrationBasicDao { + + SuppliersRegistrationBasicEntity findRegistration(Long id); + + SuppliersRegistrationBasicEntity findRegistrationByName(String recordProductName); + + List getRegistration(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest); + + boolean modifyRegistration(SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity); + + boolean insertRegistration(SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemExcelTemplateDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemExcelTemplateDao.java new file mode 100644 index 0000000..bed7bc9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemExcelTemplateDao.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.dao.param; + +import com.glxp.sale.admin.entity.param.SystemExcelTemplateEntity; +import com.glxp.sale.admin.req.param.SystemExcelTemplateRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SystemExcelTemplateDao { + + List filterSystemExcelTemplate(SystemExcelTemplateRequest systemExcelTemplateRequest); + + SystemExcelTemplateEntity findSystemExcelTemplateByName(String name); + + List getSystemExcelTemplate(SystemExcelTemplateRequest systemExcelTemplateRequest); + + boolean updateSystemExcelTemplate(SystemExcelTemplateEntity companyCertEntity); + + boolean insertSystemExcelTemplate(SystemExcelTemplateEntity companyCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFModuleDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFModuleDao.java new file mode 100644 index 0000000..6fd2280 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFModuleDao.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.dao.param; + +import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; +import com.glxp.sale.admin.req.param.SystemPDFModuleRequest; +import com.glxp.sale.admin.req.param.SystemPDFModuleSaveRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SystemPDFModuleDao { + + List queryPage(SystemPDFModuleRequest systemPDFModuleRequest); + + List listPDFModules(); + + SystemPDFModuleEntity findSystemPDFModule(SystemPDFModuleRequest systemPDFModuleRequest); + + SystemPDFModuleEntity selectById(String id); + + boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest); + + boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); + + boolean deleteById(Integer id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateDao.java new file mode 100644 index 0000000..1efc532 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateDao.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.dao.param; + +import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; +import com.glxp.sale.admin.req.param.SystemPDFTemplateRequest; +import com.glxp.sale.admin.req.param.SystemPDFTemplateSaveRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SystemPDFTemplateDao { + + List queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest); + + List listPDFTemplates(); + + SystemPDFTemplateEntity findSystemPDFTemplate(SystemPDFTemplateRequest systemPDFTemplateRequest); + + SystemPDFTemplateEntity selectById(String id); + + boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest); + + boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); + + boolean deleteById(Integer id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java new file mode 100644 index 0000000..ceef5eb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemPDFTemplateRelevanceDao.java @@ -0,0 +1,49 @@ +package com.glxp.sale.admin.dao.param; + +import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface SystemPDFTemplateRelevanceDao { + + /** + * 根据 customerId 查询 + * @param customerId 传入的 customerId + * @return + */ + List listByCustomerId(Long customerId); + + /** + * 根据 多个 customerId 查询 + * @param customerIds 传入的 customerIds + * @return + */ + List listByCustomerIdIn(List customerIds); + + /** + * 根据 template_id 查询 customer_id + * @param templateId 传入的 templateId + * @return + */ + List listByTemplateId(int templateId); + + /** + * 批量插入 + * @param systemPDFTemplateRelevanceEntityList + * @return + */ + int insertSystemPDFTemplateRelevanceAll(List systemPDFTemplateRelevanceEntityList); + + boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); + + + /** + * 根据 customerId 删除 + * @param customerId + * @return + */ + boolean deleteByCustomerId(Long customerId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemParamConfigDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemParamConfigDao.java new file mode 100644 index 0000000..667ca52 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/param/SystemParamConfigDao.java @@ -0,0 +1,31 @@ +package com.glxp.sale.admin.dao.param; + +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.req.param.SystemParamConfigRequest; +import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SystemParamConfigDao { + List queryPage(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamName(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamKey(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamKey(@Param("paramKey") String paramKey); + + String selectValueByParamKey(String key); + + boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean insert(SystemParamConfigEntity systemParamConfigEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CodesDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CodesDao.java new file mode 100644 index 0000000..778d3ce --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CodesDao.java @@ -0,0 +1,47 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.WarehouseQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CodesDao { + + List listWarehouse(WarehouseQueryRequest warehouseQueryRequest); + + boolean insertWarehouse(WarehouseEntity warehouseEntity); + + boolean insertWarehouses(@Param("io_codesEntities") List warehouseEntities); + + List findByNo(WarehouseQueryRequest warehouseQueryRequest); + + Integer isExit(WarehouseEntity warehouseEntity); + + List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + List findByReceiptId(@Param("orderId") String orderId); + + boolean deleteByOrderId(@Param("orderId") String orderId); + + + List findByCode(@Param("code") String code); + + List searchCode(@Param("code") String code); + + boolean updateOrderId(@Param("oldOrderId") String oldOrderId, @Param("newOrderId") String newOrderId); + + boolean updateUnit(@Param("orderId") String orderId, @Param("fromCorpId") String fromCorpId, @Param("fromCorp") String fromCorp); + + List findCodesById(@Param("orderId") String orderId); + + boolean updateCode(WarehouseEntity warehouseEntity); + + boolean updateRelId(@Param("relId") String relId, @Param("nameCode") String nameCode, @Param("orderId") String orderId); + + boolean updateSupId(@Param("supId") String supId, @Param("nameCode") String nameCode, @Param("orderId") String orderId); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CorpImportDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CorpImportDetailDao.java new file mode 100644 index 0000000..dd4a298 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CorpImportDetailDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.CorpImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CorpImportDetailDao { + + List filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean insertCorpImports(@Param("corps") List corpImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CorpImportLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CorpImportLogDao.java new file mode 100644 index 0000000..defa42a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/CorpImportLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.CorpImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CorpImportLogDao { + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean updateImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/IOOrderStatusDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/IOOrderStatusDao.java new file mode 100644 index 0000000..554b3f8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/IOOrderStatusDao.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.IOOrderStatusEntity; +import com.glxp.sale.admin.req.sync.OrderStatusFilterRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface IOOrderStatusDao { + + List filterOrderStatus(OrderStatusFilterRequest warehouseQueryRequest); + + boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity); + + boolean deleteByOrderId(@Param("orderId") String orderId); + + boolean updateOrderStatus(IOOrderStatusEntity warehouseEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/OrderDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/OrderDao.java new file mode 100644 index 0000000..b9e9bb3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/OrderDao.java @@ -0,0 +1,53 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.OrderFilterRequest; +import com.glxp.sale.admin.req.sync.OrderQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OrderDao { + + List listOrder(OrderQueryRequest orderQueryRequest); + + boolean insertOrder(OrderEntity orderEntity); + + boolean updateOrder(OrderEntity orderEntity); + + List listOrderError(OrderQueryRequest orderQueryRequest); + + List listOrderRepeat(OrderQueryRequest orderQueryRequest); + + boolean deleteByOrderId(@Param("orderId") String orderId); + + boolean deleteById(@Param("id") String id); + + boolean updateUnit(OrderEntity orderEntity); + + boolean updateOrderStatus(@Param("orderId") String orderId, @Param("status") Integer status); + + boolean updateExportStatus(@Param("orderId") String orderId, @Param("exportStatus") Integer exportStatus); + + boolean updateContrastStatus(@Param("orderId") String orderId, @Param("contrastStatus") String contrastStatus); + + boolean updateSignStatus(@Param("orderId") String orderId, @Param("signStatus") String signStatus); + + boolean updateRemark(@Param("orderId") String orderId, @Param("remark") String remark); + + List filterListOr(OrderFilterRequest orderFilterRequest); + + List filterList(OrderFilterRequest orderFilterRequest); + + List filterListByCode(@Param("warehouseEntityList") List warehouseEntityList); + + List filterListByOrder(@Param("orderList") List orderList); + + + OrderEntity findOne(OrderFilterRequest orderFilterRequest); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/OrderDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/OrderDetailDao.java new file mode 100644 index 0000000..bae9ccc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/OrderDetailDao.java @@ -0,0 +1,46 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.ErpOrderEntity; +import com.glxp.sale.admin.req.sync.FilterErpOrderRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OrderDetailDao { + + List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findByStockCheck(@Param("orderids") List orderids); + + List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findAllByDocids(@Param("docids") List docids); + + List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest); + + boolean insertErpOrders(@Param("erpOrderEntities") List erpOrderEntities); + + boolean insertErpOrder(ErpOrderEntity erpOrderEntity); + + boolean updateErpOrder(ErpOrderEntity erpOrderEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByPrimiyId(@Param("id") String id); + + + Integer isExit(@Param("docid") String docid); + + List selectAllIds(@Param("docids") List docids); + + + ErpOrderEntity findById(@Param("id") String id); + + boolean deleteByOrderId(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrImportLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrImportLogDao.java new file mode 100644 index 0000000..cb00416 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrImportLogDao.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.ThrImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrImportLogEntity thrOrderImportLogEntity); + + boolean updateImportLog(ThrImportLogEntity thrOrderImportLogEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrOrderImportDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrOrderImportDetailDao.java new file mode 100644 index 0000000..eed412a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrOrderImportDetailDao.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.ThrOrderImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderImportDetailDao { + + List filterOrderdDetailImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertOrderdDetailImport(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean updateOrderdDetailImport(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean insertOrderdDetailImports(@Param("orders") List thrOrderImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrOrderImportLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrOrderImportLogDao.java new file mode 100644 index 0000000..56820d6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrOrderImportLogDao.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.ThrOrderImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrProductsImportDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrProductsImportDetailDao.java new file mode 100644 index 0000000..fc3acb4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrProductsImportDetailDao.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.ThrProductsImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrProductsImportDetailDao { + + + List filterProductsDetailImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean insertProductsDetailImports(@Param("products") List thrOrderImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrProductsImportLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrProductsImportLogDao.java new file mode 100644 index 0000000..a8a1190 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/ThrProductsImportLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.ThrProductsImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrProductsImportLogDao { + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/UdiInfoImportDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/UdiInfoImportDetailDao.java new file mode 100644 index 0000000..72b0388 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/UdiInfoImportDetailDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.UdiInfoImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoImportDetailDao { + + List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean insertUdiInfoImports(@Param("udiInfos") List udiInfos); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/UdiInfoImportLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/UdiInfoImportLogDao.java new file mode 100644 index 0000000..9eac826 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/sync/UdiInfoImportLogDao.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.dao.sync; + +import com.glxp.sale.admin.entity.sync.UdiInfoImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java new file mode 100644 index 0000000..60dffbd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java @@ -0,0 +1,31 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +@Data +public class AuthAdmin { + + // 主键 + private Long id; + // 昵称 + private String userName; + // 登录密码 + private String passWord; + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + private Date lastLoginTime; + // 创建时间 + private Date createTime; + // 状态 + private Integer userFlag; + + private Date lastModifyTime; + private String comments; + private String employeeName; + private long CustomerId; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthPermission.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthPermission.java new file mode 100644 index 0000000..a2668e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthPermission.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +/** + * 权限授权表 + */ +@Data +public class AuthPermission { + + private Long id; + + private Long roleId; + + private Long permissionRuleId; + + private String type; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthPermissionRule.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthPermissionRule.java new file mode 100644 index 0000000..058ebfe --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthPermissionRule.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +/** + * 规则表 + */ +@Data +public class AuthPermissionRule { + + private Long id; + private Long pid; + private String name; + private String title; + private Integer status; + private String condition; + private Integer listorder; + private Date createTime; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthRole.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthRole.java new file mode 100644 index 0000000..1420c51 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthRole.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +/** + * 角色表 + */ +@Data +public class AuthRole { + + private Long id; + private String name; + private Long pid; + private Long status; + private String remark; + private Long listorder; + private Date createTime; + private Date updateTime; + private Integer isCustomer; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthRoleAdmin.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthRoleAdmin.java new file mode 100644 index 0000000..0e05df7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthRoleAdmin.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +/** + * 用户角色对应表 + */ +@Data +public class AuthRoleAdmin { + private Long id; + private Long role_id; + private Long admin_id; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java new file mode 100644 index 0000000..f8bcfa9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +@Data +public class CustomerContactEntity { + + private Long id; + private Long customerId; + private String contacts; + private String mobile; + private String tel; + private String email; + private String comments; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java new file mode 100644 index 0000000..df733da --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java @@ -0,0 +1,31 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +@Data +public class CustomerDetailEntity { + + private Long customerId; + private String customerName; + private String creditNum; + private String area; + private String detailAddr; + private Integer bussinessStatus; + private Integer userFlag; + private int isInfoLink; + private String infoLink; + private String roleId; + private int userMax; + private String contacts; + private String mobile; + private String tel; + private String email; + private String companyName; + + private String role; + private String count; + + private String pdfTemplateId; + + private String filePath; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerInfoEntity.java new file mode 100644 index 0000000..743fb0d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerInfoEntity.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +@Data +public class CustomerInfoEntity { + private Long customerId; + private String customerName; + private String creditNum; + private String area; + private String detailAddr; + private Integer bussinessStatus; + private Integer userFlag; + private Integer isInfoLink; + private String infoLink; + private String roleId; + private String comments; + private int userMax; + private String companyName; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java new file mode 100644 index 0000000..38e5af4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +@Data +public class UpdateUserflagBean { + private Long CustomerId; + private Integer userFlag; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java new file mode 100644 index 0000000..79918be --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UserRegisterEntity.java @@ -0,0 +1,30 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +@Data +public class UserRegisterEntity { + + private Integer id; + private String nickName; + private String password; + private String realName; + private String tel; + private String mobile; + private String userId; + private String email; + private String companyId; + private String companyName; + private String creditNum; + private String area; + private String detailAddr; + private Integer bussinessStatus; + private Integer checkType; + private String registerTime; + private String checkTime; + private String comments; + private int checkCode; + private String areaCode; + private String userName; + private String licenseUrl; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/AliCertEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/AliCertEntity.java new file mode 100644 index 0000000..2ebf57b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/AliCertEntity.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class AliCertEntity { + private int id; + private String appKey; + private String appSecret; + private String companyName; + private String aliUser; + private String aliPasswd; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/AliKeyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/AliKeyEntity.java new file mode 100644 index 0000000..bd51447 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/AliKeyEntity.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class AliKeyEntity { + + private String refEntId; + private String entId; + private String appKey; + private String appSecret; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ApilogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ApilogEntity.java new file mode 100644 index 0000000..a3759eb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ApilogEntity.java @@ -0,0 +1,251 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class ApilogEntity { + + private String customerId; + private Integer lsyd_uploadretail; + private Integer lsyd_uploadinoutbill; + private Integer lsyd_query_billstatus; + private Integer lsyd_query_upbillcode; + private Integer lsyd_query_upbilldetail; + private Integer lsyd_query_relation; + private Integer lsyd_query_codedetail; + private Integer lsyd_query_getentinfo; + private Integer lsyd_listupout; + private Integer lsyd_listupout_detail; + private Integer kyt_uploadcircubill; + private Integer kyt_searchstatus; + private Integer kyt_getbyentid; + private Integer kyt_getbyrefentid; + private Integer kyt_listparts; + private Integer kyt_synonymauths; + private Integer kyt_drugtable; + private Integer kyt_listupout; + private Integer kyt_uploadrelation; + private Integer kyt_uploadinoutbill; + private Integer kyt_singlerelation; + private Integer kyt_codeprocess; + private Integer bill_upbill_detail_withcode; + private Integer kyt_getentinfo; + private Integer kyt_searchbill; + private Integer kyt_querycodeactive; + private Integer kyt_querycode; + private Integer kyt_listparts_byagent; + private Integer kyt_drugrescode; + private Integer kyt_remnantbill_upload; + + + + public static ApilogEntity getLsyd_uploadretail(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_uploadretail(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_uploadinoutbill(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_uploadinoutbill(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_query_billstatus(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_uploadinoutbill(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_query_upbillcode(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_query_upbillcode(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_query_upbilldetail(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_listupout_detail(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_query_relation(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_uploadinoutbill(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_query_codedetail(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_query_relation(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_query_getentinfo(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_getentinfo(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_listupout(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_listupout(1); + return apilogEntity; + } + + public static ApilogEntity getLsyd_listupout_detail(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_uploadinoutbill(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_uploadcircubill(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_uploadcircubill(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_searchstatus(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_searchstatus(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_getbyentid(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_getbyentid(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_getbyrefentid(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setLsyd_uploadinoutbill(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_listparts(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_listparts(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_synonymauths(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_synonymauths(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_drugtable(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_drugtable(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_listupout(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_listupout(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_uploadrelation(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_uploadrelation(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_uploadinoutbill(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_uploadinoutbill(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_singlerelation(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_singlerelation(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_codeprocess(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_codeprocess(1); + return apilogEntity; + } + + public static ApilogEntity getBill_upbill_detail_withcode(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setBill_upbill_detail_withcode(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_getentinfo(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setKyt_getentinfo(1); + apilogEntity.setCustomerId(customerId); + return apilogEntity; + } + + public static ApilogEntity getKyt_searchbill(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_searchbill(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_querycodeactive(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_querycodeactive(1); + return apilogEntity; +} + + public static ApilogEntity getKyt_querycode(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_querycode(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_listparts_byagent(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_listparts_byagent(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_drugrescode(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_drugrescode(1); + return apilogEntity; + } + + public static ApilogEntity getKyt_remnantbill_upload(String customerId) { + ApilogEntity apilogEntity = new ApilogEntity(); + apilogEntity.setCustomerId(customerId); + apilogEntity.setKyt_remnantbill_upload(1); + return apilogEntity; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java new file mode 100644 index 0000000..bfae008 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyCertEntity.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanyCertEntity { + + private Integer id; + private Long customerId; + private String name; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java new file mode 100644 index 0000000..fd312ff --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java @@ -0,0 +1,66 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanyEntity { + + private String companyName; //企业名称 + private Integer bussinessStatus; //企业类型 + private String creditNum; //统一社会信用代码 + private String classes; //企业类别 //企业类别：1.生产企业，2.流通企业，3。医疗机构 + + private String area; + private String areaCode; + private String detailAddr; + private String appId; + private String appSecret; + private Long customerId; + private String contacts; + private String mobile; + private String tel; + private String email; + + private String refEntId; + private String entId; + private int networkType; + private int certIdFk; + + private String parentCompany; + private String parentIdFk; + + private String contactsPapersType; + private String contactsPapersCode; + private String registerStatus; + private String jyxkzh; + private String jyxkzfzjg; + private Date jyxkzyxq; + private String jybapzh; + private String jybabm; + private Date fzrq; + private String suihao; + private String kaihuhang; + private String kaihuzhanghao; + + private String auditStatus; + private String unitIdFk; + + private String filePath; + private String newFilePath; + private String filePath2; + private String newFilePath2; + private String filePath3; + private String newFilePath3; + private String filePath4; + private String newFilePath4; + + private String updateCause; + private String newAuditStatus; + private String noPassCause; + private String auditor; + + private String auditStatusList; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java new file mode 100644 index 0000000..9677a2a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanyProductRelevanceEntity { + + private Integer id; + private Long customerId; + private Long productId; + private Long enterpriseId; + private Long registrationId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; + private String auditStatus; + private String productUuid; + private Integer udiRlIdFk; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanySalesmanEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanySalesmanEntity.java new file mode 100644 index 0000000..f487bd1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanySalesmanEntity.java @@ -0,0 +1,28 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanySalesmanEntity { + + private Integer id; + private Long customerId; + private String name; + private String tel; + private String phone; + private String email; + private String certType; + private String certCode; + private String filePath; + private String filePath2; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; + private String auditStatus; + + private String newFilePath; + private String newFilePath2; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanySalesmanUpdateLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanySalesmanUpdateLogEntity.java new file mode 100644 index 0000000..039cf2b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanySalesmanUpdateLogEntity.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanySalesmanUpdateLogEntity { + + private Integer id; + private Long customerId; + private Long salesmanId; + private String updateCause; + private String status; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date update_time; + private String submit; + private String auditor; + private String noPassCause; + private String param; + private String logType; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java new file mode 100644 index 0000000..6b81227 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CompanyUpdateLogEntity { + + private Integer id; + private Long customerId; + private String updateCause; + private String status; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date update_time; + private String submit; + private String auditor; + private String noPassCause; + private String param; + private String logType; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/DeviceKeyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/DeviceKeyEntity.java new file mode 100644 index 0000000..e60598e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/DeviceKeyEntity.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class DeviceKeyEntity { + private String id; + private String imei; + private int isCheck; + private String companyName; + private String phone; + private String contact; + private String imeiKey; + private String date; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/MipsServiceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/MipsServiceEntity.java new file mode 100644 index 0000000..2276e9e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/MipsServiceEntity.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class MipsServiceEntity { + private String mipsName; + private String url; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ScheduledEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ScheduledEntity.java new file mode 100644 index 0000000..22df7dd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ScheduledEntity.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class ScheduledEntity { + + private int id; + private String cronName; + private String cron; + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SetupEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SetupEntity.java new file mode 100644 index 0000000..1dd73f7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SetupEntity.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class SetupEntity { + + private String customerId; + private boolean checkUpbill; + private boolean checkStock; + private boolean checkRepeat; + private boolean downloadRelation; + private int uploadTime; //自动上传保留时间 + private long lastUploadDate; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SupplierEnterpriseBasicCertEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SupplierEnterpriseBasicCertEntity.java new file mode 100644 index 0000000..7947e66 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SupplierEnterpriseBasicCertEntity.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SupplierEnterpriseBasicCertEntity { + + private Integer id; + private Long enterpriseId; + private String name; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SuppliersEnterpriseBasicEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SuppliersEnterpriseBasicEntity.java new file mode 100644 index 0000000..b54b82e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SuppliersEnterpriseBasicEntity.java @@ -0,0 +1,33 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SuppliersEnterpriseBasicEntity { + + private Long id; + private String companyName; + private String creditCode; + private String companyType; + private String placeArea; + private String placeAreaCode; + private String placeAddress; + private String detailAddr; + private String legalPersonName; + private String legalPersonPapersType; + private String legalPersonPapersCode; + private String productionArea; + private String productionAreaCode; + private String productionAddress; + private String registerStatus; + private String productionLicenceNum; + private Date productionLicenceDate; + private String productionRecordNum; + private String productionRecordSection; + private Date productionRecordDate; + private String remark; + private Date createDate; + private Date updateDate; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SuppliersRegistrationBasicEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SuppliersRegistrationBasicEntity.java new file mode 100644 index 0000000..e40c711 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/SuppliersRegistrationBasicEntity.java @@ -0,0 +1,45 @@ +package com.glxp.sale.admin.entity.info; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SuppliersRegistrationBasicEntity { + + private Long id; + private Long enterpriseId; + private String recordCode; + private String recordProductName; + private String productManageType; + private String recordPeopleName; + private String recordPeopleArea; + private String recordPeopleAreaCode; + private String recordPeopleAddress; + private String productType; + private String productDirectoryCode; + private String agentName; + private String agentArea; + private String agentAreaCode; + private String agentAddress; + private String instructions; + private String productAddress; + private String recordText; + private String placeOrigin; + private String productionRegion; + private String productionCompanyName; + private String afterSale; + private String specification; + private String structure; + private String scope; + private String other; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_date; + private Date update_date; + + private String newFilePath; + private String newInstructions; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/WebSocketEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/WebSocketEntity.java new file mode 100644 index 0000000..ea944a7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/WebSocketEntity.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class WebSocketEntity { + private String type; + private String data; + + public WebSocketEntity(String type, String data) { + this.type = type; + this.data = data; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemExcelTemplateEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemExcelTemplateEntity.java new file mode 100644 index 0000000..a75f945 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemExcelTemplateEntity.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.entity.param; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemExcelTemplateEntity { + + private Integer id; + private String name; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java new file mode 100644 index 0000000..c181c22 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.entity.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFModuleEntity { + + private int id; + private String name; + private String param; + private String fieldExplain; + private int templateId; + private String remark; + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateEntity.java new file mode 100644 index 0000000..fce4ea8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateEntity.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.entity.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFTemplateEntity { + + private int id; + private String name; + private int type; + private int module; + private String param; + private String path; + private int rowCount; + private int qrcodeCount; + private String remark; + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java new file mode 100644 index 0000000..ae8f9a3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFTemplateRelevanceEntity.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.entity.param; + +import lombok.Data; + +/** + * 用户角色对应表 + */ +@Data +public class SystemPDFTemplateRelevanceEntity { + private int id; + private int template_id; + private Long customerId; + private int admin_id; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemParamConfigEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemParamConfigEntity.java new file mode 100644 index 0000000..98a798c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemParamConfigEntity.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.entity.param; + +import lombok.Data; + +@Data +public class SystemParamConfigEntity { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/CorpImportDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/CorpImportDetailEntity.java new file mode 100644 index 0000000..e59c1df --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/CorpImportDetailEntity.java @@ -0,0 +1,37 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CorpImportDetailEntity { + + private Integer id; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String creditNo; + private String contact; + private String mobile; + + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + private String thirdName; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + + private String remark; + private Date updateTime; + private String genKeyFk; + private Integer importStatus; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/CorpImportLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/CorpImportLogEntity.java new file mode 100644 index 0000000..98b9ffe --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/CorpImportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CorpImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ErpOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ErpOrderEntity.java new file mode 100644 index 0000000..81c09b2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ErpOrderEntity.java @@ -0,0 +1,71 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +@Data +public class ErpOrderEntity { + + + /** + * companyid : 31443 + * docid : 200959 + * iodtlid : 1108752 + * inoutid : 1064084 + * credate : 2020-10-14 10:24:56.0 + * goodsunit : 瓶 + * goodsid : 26 + * lotid : 84392 + * goodsname : 川贝清肺糖浆（120ml） + * companyname : 安徽阜阳医药集团有限公司 + * lotno : 1912198 + * dtlgoodsqty : 4000 + */ + + private long id; + private String erpOrderId; + private String iodtlId; + private String inoutId; + private String companyid; + private String companyname; + private String goodsid; + private String goodsname; + private String goodsunit; + private String batchNoId; + private String batchNo; + private String credate; + private String warehouseCode; + private String productDate; + private String expireDate; + private Integer erpCount; + private Integer reCount; + private String uuidFk; + private String supId; + private Integer bindSupStatus; + + + private String nameCode; + private String productCompany; + private String coName; + private String authCode; + private String packSpec; + private String packRatio; + private int bhzxxsbzsl; + private int zxxsbzbhsydysl; + private String isDownload; + private String orderIdFk; + private String nameCodes; + private String status; + private Integer count; + private Integer bindStatus; + + + public Integer getBindStatus() { + if (bindStatus == null) + return 0; + return bindStatus; + } + + private String bindRlFk; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IOOrderStatusEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IOOrderStatusEntity.java new file mode 100644 index 0000000..069e35f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/IOOrderStatusEntity.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IOOrderStatusEntity { + private Integer id; + private String orderId; + private Integer status; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java new file mode 100644 index 0000000..81b4430 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java @@ -0,0 +1,37 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +@Data +public class OrderEntity { + + private String id; + private String corpOrderId; + private String action; + private String actDate; + + private String actor; + private String mainAction; + private String fromCorpId; + private String fromCorp; + private Integer status; + + private Integer fromType; + private Integer contrastStatus; + private String erpFk; + private Integer signStatus; + private String stockCheckFk; + private String remark; + private Integer receiveStatus; + private String supId; + + + private String customerId; + + private Integer exportStatus; + private String exportFilePath; + private Integer dlCount; + + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/PostOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/PostOrderRequest.java new file mode 100644 index 0000000..4fb0247 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/PostOrderRequest.java @@ -0,0 +1,87 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.List; + +@Data +public class PostOrderRequest { + List postOrders; + int submitType;//0：提交，1：保存 + String oldOrderId;//保存再编辑后再保存或提交，根据旧id删除旧数据。 + private String customerId; + + public List getPostOrder() { + return postOrders; + } + + public void setPostOrder(List postOrder) { + this.postOrders = postOrder; + } + + public int getSubmitType() { + return submitType; + } + + public void setSubmitType(int submitType) { + this.submitType = submitType; + } + + public String getOldOrderId() { + return oldOrderId; + } + + public void setOldOrderId(String oldOrderId) { + this.oldOrderId = oldOrderId; + } + + public static class PostOrder { + public List erpOrders; + List codes; + private String billType; + private String orderId; + + public String getStockIdFk() { + return stockIdFk; + } + + public void setStockIdFk(String stockIdFk) { + this.stockIdFk = stockIdFk; + } + + private String stockIdFk; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + public List getErpOrders() { + return erpOrders; + } + + public void setErpOrders(List erpOrders) { + this.erpOrders = erpOrders; + } + + public List getCodes() { + return codes; + } + + public void setCodes(List codes) { + this.codes = codes; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrImportLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrImportLogEntity.java new file mode 100644 index 0000000..c6bdfb1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrImportLogEntity.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Integer importType; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; + private String filePath; + private String backFilePath; + private String orderId; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderImportDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderImportDetailEntity.java new file mode 100644 index 0000000..7b12b3a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderImportDetailEntity.java @@ -0,0 +1,32 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrOrderImportDetailEntity { + + private Integer id; + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private Integer count; + private Integer reCount; + private Integer status; + private Date updateTime; + private String remark; + private String genKeyFk; + private String thirdSysFk; + private String originType; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderImportLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderImportLogEntity.java new file mode 100644 index 0000000..a79c752 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrOrderImportLogEntity.java @@ -0,0 +1,17 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrOrderImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsImportDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsImportDetailEntity.java new file mode 100644 index 0000000..57f3512 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsImportDetailEntity.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrProductsImportDetailEntity { + private Integer id; + private String code; + private String name; + private String measname; + private String spec; + private String registerNo; + private String manufactory; + private String thirdSysFk; + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; + private Date updateTime; + private String genKeyFk; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsImportLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsImportLogEntity.java new file mode 100644 index 0000000..fc8e05b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/ThrProductsImportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrProductsImportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoImportDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoImportDetailEntity.java new file mode 100644 index 0000000..885f4d0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoImportDetailEntity.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UdiInfoImportDetailEntity { + + private Integer id; + private String udiCode; + private String ybbm; + private String sptm; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String thirdId; + private Integer status; + private Date updateTime; + private String remark; + private String genKeyFk; + private Integer dataType; + private String isUseDy; + private String nameCode; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoImportLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoImportLogEntity.java new file mode 100644 index 0000000..1fd3356 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/UdiInfoImportLogEntity.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UdiInfoImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; + private Integer dataType; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/WarehouseEntity.java new file mode 100644 index 0000000..5742440 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/WarehouseEntity.java @@ -0,0 +1,39 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +@Data +public class WarehouseEntity { + private Long id; + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private String fromCorpId; + private String fromCorp; + private String orderId; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private Integer count; + private String packageLevel; + private String warehouseCode; + + private String customerId; + private String nameCode; + private String supId;//供应商ID + + private String relId; + private Integer status; + + public String getSupId() { + + if (supId == null) { + return fromCorpId; + } + return supId; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/exception/JsonException.java b/api-admin/src/main/java/com/glxp/sale/admin/exception/JsonException.java new file mode 100644 index 0000000..08381f6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/exception/JsonException.java @@ -0,0 +1,28 @@ +package com.glxp.sale.admin.exception; + +import com.glxp.sale.common.enums.ResultEnum; +import lombok.Getter; + +/** + * 错误处理类 + */ +@Getter +public class JsonException extends RuntimeException{ + + private Integer code; + + public JsonException(ResultEnum resultEnum) { + super(resultEnum.getMessage()); + this.code = resultEnum.getCode(); + } + + public JsonException(ResultEnum resultEnum, String message) { + super(message); + this.code = resultEnum.getCode(); + } + + public JsonException(Integer code, String message) { + super(message); + this.code = code; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java b/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java new file mode 100644 index 0000000..509328c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java @@ -0,0 +1,33 @@ +package com.glxp.sale.admin.handler; + +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * 错误回调 + */ +@RestControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + + // 拦截API异常 + @ExceptionHandler(value = JsonException.class) + public BaseResponse handlerJsonException(JsonException e) { + // 返回对应的错误信息 + return ResultVOUtils.error(e.getCode(), e.getMessage()); + } + + // 拦截API异常 + @ExceptionHandler(value = RuntimeException.class) + public BaseResponse handlerRuntimeException(RuntimeException e) { + log.error(e.getMessage()); + // 返回对应的错误信息 + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java b/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java new file mode 100644 index 0000000..a0880f9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java @@ -0,0 +1,76 @@ +package com.glxp.sale.admin.http; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.sale.admin.req.sync.*; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.UdiRelevanceResponse; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service +public class PostSmpHttp { + + @Value("${SPMS_IP}") + private String spmsUrl; + + public BaseResponse postOrder(PostThrOrderRequest postThrOrderRequest) { + String result = UHttpClient.postJson(spmsUrl+"/udiwms/thrsys/postOrderDetail", postThrOrderRequest); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + + public BaseResponse postUdiInfo(PostUdiInfoRequest postUdiInfoRequest) { + String result = UHttpClient.postJson(spmsUrl+"/udiwms/basic/products/upload", postUdiInfoRequest); + + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + + public BaseResponse postThrProducts(PostThrProductsRequest postThrProductsRequest) { + String result = UHttpClient.postJson(spmsUrl+"/udiwms/thrsys/postThrProducts", postThrProductsRequest); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + + public BaseResponse postCorp(PostCorpsRequest postCorpsRequest) { + String result = UHttpClient.postJson(spmsUrl+"/udiwms/basic/corps/upload", postCorpsRequest); + + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + public BaseResponse getUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { + Map paramMap = new HashMap<>(16); + paramMap.put("page", filterUdiInfoRequest.getPage()); + paramMap.put("limit", filterUdiInfoRequest.getLimit()); + paramMap.put("lastUpdateTime", filterUdiInfoRequest.getLastUpdateTime()); + String response = UHttpClient.mipsGet(spmsUrl + "/udiwms/basic/products/download", paramMap); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return udiDlDeviceResponse; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/http/SpGetHttp.java b/api-admin/src/main/java/com/glxp/sale/admin/http/SpGetHttp.java new file mode 100644 index 0000000..d4c1c24 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/http/SpGetHttp.java @@ -0,0 +1,69 @@ +package com.glxp.sale.admin.http; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.sale.admin.entity.sync.IOOrderStatusEntity; +import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.req.sync.OrderStatusFilterRequest; +import com.glxp.sale.admin.req.sync.PostThrOrderRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.DlOrderResponse; +import com.glxp.sale.admin.res.sync.UdiRelevanceResponse; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class SpGetHttp { + + @Value("${SPMS_IP}") + private String spmsUrl; + + public BaseResponse> getOrderStatus() { + Map paramMap = new HashMap<>(16); + String response = UHttpClient.mipsGet(spmsUrl + "/spms/inout/order/status", paramMap); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + + + public BaseResponse> getOrders(String orderId) { + Map paramMap = new HashMap<>(16); + paramMap.put("status", 1); + String response = UHttpClient.mipsGet(spmsUrl + "/spms/inout/order/dlByStatus", paramMap); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + + + public BaseResponse postOrder(String orderId) { + OrderStatusFilterRequest orderStatusFilterRequest = new OrderStatusFilterRequest(); + orderStatusFilterRequest.setOrderId(orderId); + String result = UHttpClient.postJson(spmsUrl + "/spms/inout/order/deleteStatus", orderStatusFilterRequest); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/http/UHttpClient.java b/api-admin/src/main/java/com/glxp/sale/admin/http/UHttpClient.java new file mode 100644 index 0000000..5cec192 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/http/UHttpClient.java @@ -0,0 +1,97 @@ +package com.glxp.sale.admin.http; + +import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; + +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; + +public class UHttpClient { + private static final Logger logger = LoggerFactory.getLogger(UHttpClient.class); + + public static String post(String url, Object object) { + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setConnectTimeout(600000); + factory.setReadTimeout(100000); + RestTemplate restTemplate = new RestTemplate(); + String json = JSONObject.toJSON(object).toString(); + MultiValueMap postParameters = new LinkedMultiValueMap<>(); + postParameters.add("params", json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/x-www-form-urlencoded"); + HttpEntity> httpEntity = new HttpEntity<>(postParameters, headers); + String response = restTemplate.postForObject(url, httpEntity, String.class); + System.out.println(response); + + return response; + } + + public static String postJson(String url, Object object) { + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setConnectTimeout(600000); + factory.setReadTimeout(20000); + RestTemplate restTemplate = new RestTemplate(factory); + String json = JSONObject.toJSON(object).toString(); + logger.info(url + "\n" + json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + HttpEntity httpEntity = new HttpEntity<>(json, headers); + String response = restTemplate.postForObject(url, httpEntity, String.class); + logger.info(response); + return response; + } + + public static String mipsGet(String url, Map params) { + StringBuffer stringBuffer = new StringBuffer(url); + if (params instanceof Map) { + Iterator iterator = ((Map) params).entrySet().iterator(); + if (iterator.hasNext()) { + stringBuffer.append("?"); + Object element; + while (iterator.hasNext()) { + element = iterator.next(); + Map.Entry entry = (Map.Entry) element; + //过滤value为null，value为null时进行拼接字符串会变成 "null"字符串 + if (entry.getValue() != null) { + String value = String.valueOf(((Map.Entry) element).getValue()); + if (value.contains("#")) { + try { + String ps = URLEncoder.encode(value, "UTF-8"); + ((Map.Entry) element).setValue(ps); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + + stringBuffer.append(element).append("&"); + } + url = stringBuffer.substring(0, stringBuffer.length() - 1); + + } + } + } else { + throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型"); + } + RestTemplate restTemplate = new RestTemplate(); + String accessTokenRequestUrl = null; + try { + accessTokenRequestUrl = new URL(url).toString(); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + logger.info(accessTokenRequestUrl); + String response = restTemplate.getForObject(accessTokenRequestUrl, String.class); + return response; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/ListPageRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/ListPageRequest.java new file mode 100644 index 0000000..66dc33d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/ListPageRequest.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.req; + +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * 分页的表单 + */ +@Data +public class ListPageRequest { + + @NotNull(message = "请选择第几页") + @Min(message = "分页参数错误", value = 1) + private Integer page; + + @NotNull(message = "请填写每页查询数量") + @Min(value = 1, message = "分页参数不能小于1") + @Max(value = 1000, message = "分页参数不能大于50") + private Integer limit; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java new file mode 100644 index 0000000..1bb4bc7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.req.auth; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class AuthAdminQueryRequest extends ListPageRequest { + + private String userName; + + private Integer userFlag; + + private Long roleId; + + private List ids; + + private String CustomerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java new file mode 100644 index 0000000..9b8001f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java @@ -0,0 +1,40 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 管理员的提交保存表单 + */ +@Data +public class AuthAdminSaveRequest { + // id + private Long id; + // 昵称 + @NotEmpty(message = "请输入用户名") + private String userName; + // 登录密码 + private String passWord; + // 状态 + @NotNull(message = "请选择状态") + private Integer userFlag; + private String employeeName; + + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + private String lastLoginTime; + // 创建时间 + private String createTime; + + private String lastModifyTime; + private String comments; + // 角色ids + private List roles; + + private long CustomerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthPermissionRuleSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthPermissionRuleSaveRequest.java new file mode 100644 index 0000000..76ec014 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthPermissionRuleSaveRequest.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 权限规则的提交保存表单 + */ +@Data +public class AuthPermissionRuleSaveRequest { + private Long id; + private Long pid; + @NotEmpty(message = "请输入规则名称") + private String name; + @NotEmpty(message = "请输入规则标题") + private String title; + @NotNull(message = "请选择状态") + private Integer status; + private String condition; + private Integer listorder; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleAuthRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleAuthRequest.java new file mode 100644 index 0000000..bcb0693 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleAuthRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 角色的授权提交表单 + */ +@Data +public class AuthRoleAuthRequest { + @NotNull(message = "请选择角色") + private Long role_id; + @NotEmpty(message = "请选择授权的权限规则") + private List auth_rules; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java new file mode 100644 index 0000000..6cd88d8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.auth; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 角色的查询表单 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AuthRoleQueryRequest extends ListPageRequest { + private String name; + private Integer status; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleSaveRequest.java new file mode 100644 index 0000000..449eec1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleSaveRequest.java @@ -0,0 +1,17 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +/** + * 角色的提交保存表单 + */ +@Data +public class AuthRoleSaveRequest { + private Long id; + private String name; + private Long pid; + private Long status; + private String remark; + private Long listorder; + private int isCustomer; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerContactFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerContactFilterRequest.java new file mode 100644 index 0000000..7aaf88f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerContactFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.auth; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class CustomerContactFilterRequest extends ListPageRequest { + private Integer customerId; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java new file mode 100644 index 0000000..7c9ef18 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.req.auth; + +import com.glxp.sale.admin.req.ListPageRequest; + +public class CustomerInfoFilterRequest extends ListPageRequest { + + private String customerName; + private long customerId; + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public long getCustomerId() { + return customerId; + } + + public void setCustomerId(long customerId) { + this.customerId = customerId; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java new file mode 100644 index 0000000..b837a35 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 登录验证 + */ +@Data +public class LoginRequest { + + @NotEmpty(message = "用户名不能为空") + private String username; + + @NotEmpty(message = "密码不能为空") + private String password; + + private Integer type; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/RefIdRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/RefIdRequest.java new file mode 100644 index 0000000..23b555d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/RefIdRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +@Data +public class RefIdRequest { + + private String companyName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/RegisterCheckRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/RegisterCheckRequest.java new file mode 100644 index 0000000..192d832 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/RegisterCheckRequest.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +@Data +public class RegisterCheckRequest { + + private Integer id; + private Integer checkType; + private Long roles; + private String aliCertId; + private String companyId; + private String companyName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java new file mode 100644 index 0000000..b7e4966 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +@Data +public class ResetPasswdRequest { + + private String password; + private String mobile; + private String confirmPassword; + private int checkCode; + private String userName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java new file mode 100644 index 0000000..fa7890b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 修改密码的表单 + */ +@Data +public class UpdatePasswordRequest { + + @NotNull(message = "参数错误！") + private Long adminId; + + @NotEmpty(message = "请输入旧密码") + private String oldPassword; + + @NotEmpty(message = "请输入新密码") + private String newPassword; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UserResisterFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UserResisterFilterRequest.java new file mode 100644 index 0000000..aa1aa72 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UserResisterFilterRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.auth; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class UserResisterFilterRequest extends ListPageRequest { + + private String companyName; + private String checkType; + private String companyId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java new file mode 100644 index 0000000..16d1df4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class CompanyRequest { + + private Long customerId; + private String companyName; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteAliCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteAliCertRequest.java new file mode 100644 index 0000000..bf2d937 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteAliCertRequest.java @@ -0,0 +1,8 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class DeleteAliCertRequest { + private String id; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteApilogRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteApilogRequest.java new file mode 100644 index 0000000..1070dc6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteApilogRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class DeleteApilogRequest { + + private String id; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteCompanyFileRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteCompanyFileRequest.java new file mode 100644 index 0000000..d705c03 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteCompanyFileRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +import java.util.List; + +@Data +public class DeleteCompanyFileRequest { + + String id; + String filePath; + String filePath2; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteRequest.java new file mode 100644 index 0000000..fe59183 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +import java.util.List; + +@Data +public class DeleteRequest { + + String id; + List ids; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteVersionRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteVersionRequest.java new file mode 100644 index 0000000..d79e4cc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/DeleteVersionRequest.java @@ -0,0 +1,8 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class DeleteVersionRequest { + private String id; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterAliCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterAliCertRequest.java new file mode 100644 index 0000000..cc8cddc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterAliCertRequest.java @@ -0,0 +1,8 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class FilterAliCertRequest { + private String id; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyCertRequest.java new file mode 100644 index 0000000..9d7c214 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyCertRequest.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanyCertRequest extends ListPageRequest { + + private String customerId; + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyProductRelevanceRequest.java new file mode 100644 index 0000000..c2a1da5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyProductRelevanceRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanyProductRelevanceRequest extends ListPageRequest { + + private Long customerId; + private Long productId; + private String productUuid; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyRequest.java new file mode 100644 index 0000000..d82fabd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterCompanyRequest extends ListPageRequest { + + private String customerId; + private String companyName; + private String creditNum; + private String auditStatus; + private String unitIdFk; + + private List auditStatusList; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanySalesmanRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanySalesmanRequest.java new file mode 100644 index 0000000..97e9628 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanySalesmanRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanySalesmanRequest extends ListPageRequest { + + private String customerId; + private String name; + private String auditStatus; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanySalesmanUpdateLogRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanySalesmanUpdateLogRequest.java new file mode 100644 index 0000000..6479716 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanySalesmanUpdateLogRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanySalesmanUpdateLogRequest extends ListPageRequest { + + private String customerId; + private String salesmanId; + private String submit; + private String status; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyUpdateLogRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyUpdateLogRequest.java new file mode 100644 index 0000000..3765dc1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterCompanyUpdateLogRequest.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCompanyUpdateLogRequest extends ListPageRequest { + + private String customerId; + private String status; + private String submit; + private String logType; + + private String noStatus; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterDeviceKeyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterDeviceKeyRequest.java new file mode 100644 index 0000000..5328723 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterDeviceKeyRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterDeviceKeyRequest extends ListPageRequest { + private String imei; + private String isCheck; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterSetupRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterSetupRequest.java new file mode 100644 index 0000000..64177c2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterSetupRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class FilterSetupRequest { + + private int id; + private String erpSign; + private String erpSaleOutModify; + private String erpPruchaseModify; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterSuppliersEnterpriseBasicCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterSuppliersEnterpriseBasicCertRequest.java new file mode 100644 index 0000000..fb1bdd4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterSuppliersEnterpriseBasicCertRequest.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterSuppliersEnterpriseBasicCertRequest extends ListPageRequest { + + private Long enterpriseId; + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterVersionRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterVersionRequest.java new file mode 100644 index 0000000..e5583d1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterVersionRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class FilterVersionRequest { + + private String type; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/ScheduledRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/ScheduledRequest.java new file mode 100644 index 0000000..9af8cc3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/ScheduledRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.info; + +import lombok.Data; + +@Data +public class ScheduledRequest { + private String cronName; + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/SuppliersEnterpriseBasicRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/SuppliersEnterpriseBasicRequest.java new file mode 100644 index 0000000..924c4d5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/SuppliersEnterpriseBasicRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class SuppliersEnterpriseBasicRequest extends ListPageRequest { + + private Long id; + private String companyName; + private String creditCode; + private String placeArea; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/SuppliersRegistrationBasicRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/SuppliersRegistrationBasicRequest.java new file mode 100644 index 0000000..c5d68a0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/SuppliersRegistrationBasicRequest.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class SuppliersRegistrationBasicRequest extends ListPageRequest { + + private Long id; + private Long enterpriseId; + private String recordCode; + private String recordProductName; + private String recordPeopleName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InoutOrderDetailPDFCodeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InoutOrderDetailPDFCodeRequest.java new file mode 100644 index 0000000..a9327da --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InoutOrderDetailPDFCodeRequest.java @@ -0,0 +1,164 @@ +package com.glxp.sale.admin.req.itextpdf; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class InoutOrderDetailPDFCodeRequest { + private String orderId; + private SettingData settingData; + + private String actionName; + private String fromCorp; + private String fromType; + private Long customerId; + + public static class SettingData { + private boolean orderIdEnable; + private int orderIdWidth; + private boolean actionEnable; + private int actionWidth; + private boolean fromCorpEnable; + private int fromCorpWidth; + private boolean fromTypeEnable; + private int fromTypeWidth; + + private boolean numberEnable; + private int numberWidth; + private boolean coNameEnable; + private int coNameWidth; + private boolean packSpecEnable; + private int packSpecWidth; + private boolean batchNoEnable; + private int batchNoWidth; + private boolean countEnable; + private int countWidth; + private boolean productCompanyEnable; + private int productCompanyWidth; + private boolean authCodeEnable; + private int authCodeWidth; + + public boolean getOrderIdEnable() { return orderIdEnable; } + public void setOrderIdEnable(boolean orderIdEnable) { + this.orderIdEnable = orderIdEnable; + } + public int getOrderIdWidth() { + return orderIdWidth; + } + public void setOrderIdWidth(int orderIdWidth) { + this.orderIdWidth = orderIdWidth; + } + + public boolean getActionEnable() { return actionEnable; } + public void setActionEnable(boolean actionEnable) { + this.actionEnable = actionEnable; + } + public int getActionWidth() { + return actionWidth; + } + public void setActionWidth(int actionWidth) { + this.actionWidth = actionWidth; + } + + public boolean getFromCorpEnable() { return fromCorpEnable; } + public void setFromCorpEnable(boolean fromCorpEnable) { + this.fromCorpEnable = fromCorpEnable; + } + public int getFromCorpWidth() { + return fromCorpWidth; + } + public void setFromCorpWidth(int fromCorpWidth) { + this.fromCorpWidth = fromCorpWidth; + } + + public boolean getFromTypeEnable() { return fromTypeEnable; } + public void setFromTypeEnable(boolean fromTypeEnable) { + this.fromTypeEnable = fromTypeEnable; + } + public int getFromTypeWidth() { + return fromTypeWidth; + } + public void setFromTypeWidth(int fromTypeWidth) { + this.fromTypeWidth = fromTypeWidth; + } + + public boolean getNumberEnable() { return numberEnable; } + public void setNumberEnable(boolean numberEnable) { + this.numberEnable = numberEnable; + } + public int getNumberWidth() { + return numberWidth; + } + public void setNumberWidth(int numberWidth) { + this.numberWidth = numberWidth; + } + + public boolean getCoNameEnable() { return coNameEnable; } + public void setCoNameEnable(boolean coNameEnable) { + this.coNameEnable = coNameEnable; + } + public int getCoNameWidth() { + return coNameWidth; + } + public void setCoNameWidth(int coNameWidth) { + this.coNameWidth = coNameWidth; + } + + public boolean getPackSpecEnable() { return packSpecEnable; } + public void setPackSpecEnable(boolean packSpecEnable) { + this.packSpecEnable = packSpecEnable; + } + public int getPackSpecWidth() { + return packSpecWidth; + } + public void setPackSpecWidth(int packSpecWidth) { + this.packSpecWidth = packSpecWidth; + } + + public boolean getBatchNoEnable() { return batchNoEnable; } + public void setBatchNoEnable(boolean batchNoEnable) { + this.batchNoEnable = batchNoEnable; + } + public int getBatchNoWidth() { + return batchNoWidth; + } + public void setBatchNoWidth(int batchNoWidth) { + this.batchNoWidth = batchNoWidth; + } + + public boolean getCountEnable() { return countEnable; } + public void setCountEnable(boolean countEnable) { + this.countEnable = countEnable; + } + public int getCountWidth() { + return countWidth; + } + public void setCountWidth(int countWidth) { + this.countWidth = countWidth; + } + + public boolean getProductCompanyEnable() { return productCompanyEnable; } + public void setProductCompanyEnable(boolean productCompanyEnable) { + this.productCompanyEnable = productCompanyEnable; + } + public int getProductCompanyWidth() { + return productCompanyWidth; + } + public void setProductCompanyWidth(int productCompanyWidth) { + this.productCompanyWidth = productCompanyWidth; + } + + public boolean getAuthCodeEnable() { return authCodeEnable; } + public void setAuthCodeEnable(boolean authCodeEnable) { + this.authCodeEnable = authCodeEnable; + } + public int getAuthCodeWidth() { + return authCodeWidth; + } + public void setAuthCodeWidth(int authCodeWidth) { + this.authCodeWidth = authCodeWidth; + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InoutOrderDetailPDFFileRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InoutOrderDetailPDFFileRequest.java new file mode 100644 index 0000000..5adeb99 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InoutOrderDetailPDFFileRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.itextpdf; + +import lombok.Data; + +@Data +public class InoutOrderDetailPDFFileRequest { + private String orderId; + + private String actionName; + private String fromCorp; + private String fromType; + private String actDate; + private Long customerId; + + private String path; + private int rowCount; + private int qrcodeCount; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InspectionPDFTemplateRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InspectionPDFTemplateRequest.java new file mode 100644 index 0000000..e966736 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/InspectionPDFTemplateRequest.java @@ -0,0 +1,17 @@ +package com.glxp.sale.admin.req.itextpdf; + +import lombok.Data; + +@Data +public class InspectionPDFTemplateRequest { + + private String queryId; + + private String id; + private int type; + private int module; + + private String orderId; + private Long customerId; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java new file mode 100644 index 0000000..70c1b66 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/itextpdf/StockQRCodeTextPDFTemplateRequest.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.req.itextpdf; + +import lombok.Data; + +@Data +public class StockQRCodeTextPDFTemplateRequest { + + private String id; + private String orderId; + private String billNo; + private String detailId; + + private String actionName; + private String text; + + private String path; + private int rowCount; + private int qrcodeCount; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemExcelTemplateRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemExcelTemplateRequest.java new file mode 100644 index 0000000..efeb4fb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemExcelTemplateRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.param; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class SystemExcelTemplateRequest extends ListPageRequest { + + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleRequest.java new file mode 100644 index 0000000..04807bd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleRequest.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.req.param; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Data +public class SystemPDFModuleRequest extends ListPageRequest { + + private int id; + private String name; + private String param; + private String fieldExplain; + private int templateId; + private String remark; + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java new file mode 100644 index 0000000..af4e279 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFModuleSaveRequest { + + private int id; + private String name; + private String param; + private String fieldExplain; + private int templateId; + private String remark; + private Date create_time; + private Date update_time; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFTemplateRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFTemplateRequest.java new file mode 100644 index 0000000..a8cabfc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFTemplateRequest.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.req.param; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Data +public class SystemPDFTemplateRequest extends ListPageRequest { + + private int id; + private String name; + private int type; + private int module; + private String param; + private String path; + private int rowCount; + private int qrcodeCount; + private String remark; + private Date create_time; + private Date update_time; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFTemplateSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFTemplateSaveRequest.java new file mode 100644 index 0000000..fb010b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFTemplateSaveRequest.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.req.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFTemplateSaveRequest { + + private int id; + private String name; + private int type; + private int module; + private String param; + private String path; + private int rowCount; + private int qrcodeCount; + private String remark; + private Date create_time; + private Date update_time; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java new file mode 100644 index 0000000..2eb11fc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.req.param; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class SystemParamConfigRequest extends ListPageRequest { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigSaveRequest.java new file mode 100644 index 0000000..f2e8d70 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigSaveRequest.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.param; + +import lombok.Data; + +@Data +public class SystemParamConfigSaveRequest { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterErpOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterErpOrderRequest.java new file mode 100644 index 0000000..b002778 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterErpOrderRequest.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterErpOrderRequest extends ListPageRequest { + + private String erpOrderId; + private String goodsname; + private String companyname; + private String orderId; + private String orderIdFk; + private String startDate; + private String endDate; + private String billAction; + private String billcode; + private String fbillflag; + List orderIds; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterSpReuqest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterSpReuqest.java new file mode 100644 index 0000000..7633011 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterSpReuqest.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class FilterSpReuqest extends ListPageRequest { + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterUdiInfoRequest.java new file mode 100644 index 0000000..976da0c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterUdiInfoRequest.java @@ -0,0 +1,44 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterUdiInfoRequest extends ListPageRequest { + + private String ylqxzcrbarmc; + private String cpmctymc; + private String nameCode; + private String uuid; + private String ggxh; + private String thirdId; + private String id; + + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + + private String thirdCode; + private String thirdSys; + + private String lastUpdateTime; + private String zczbhhzbapzbh; + private Integer diType; + + + private String unionCode; + private String udiCode; + private String thrPiId; + + + private Boolean isCheck; + + private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码 + private Integer dataType; + + private String customerId; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterUdiIpLogRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterUdiIpLogRequest.java new file mode 100644 index 0000000..2cff895 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/FilterUdiIpLogRequest.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + + +@Data +public class FilterUdiIpLogRequest extends ListPageRequest { + + private Integer id; + private String genKey; + private Integer status; + private String thirdSysFk; + private String fromType; + private Integer dataType; + private String lastUpdateTime; + private Integer importType; + private String orderId; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderFilterRequest.java new file mode 100644 index 0000000..d0f2093 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderFilterRequest.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderFilterRequest extends ListPageRequest { + + private String id; + private String action; + private String mainAction; + private String code; + private Integer exportStatus; + private Integer status; + private String corpOrderId; + private Integer contrastStatus; + private Integer unionCtrStatus; + private Integer signStatus; + private String startTime; + private String endTime; + private String stockCheckFk; + private Integer receiveStatus; + private Integer statusOrOne; + private String customerId; + private String fromCorpId; + private String orderId;//业务单据ID，手持终端上传上来的 +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderQueryRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderQueryRequest.java new file mode 100644 index 0000000..cf656e4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderQueryRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderQueryRequest extends ListPageRequest { + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderStatusFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderStatusFilterRequest.java new file mode 100644 index 0000000..fc23ad4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/OrderStatusFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderStatusFilterRequest extends ListPageRequest { + private String orderId; + private Integer status; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostCorpsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostCorpsRequest.java new file mode 100644 index 0000000..648b10b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostCorpsRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.entity.sync.CorpImportDetailEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostCorpsRequest { + private String genKey; + private List datas; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThrOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThrOrderRequest.java new file mode 100644 index 0000000..5878133 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThrOrderRequest.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.res.sync.ErpOrderResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrOrderRequest { + + private String genKey; + private String thirdSys; + private List datas; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThrProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThrProductsRequest.java new file mode 100644 index 0000000..3e51856 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThrProductsRequest.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.res.sync.ErpProductsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrProductsRequest { + + private String genKey; + private String thirdSys; + private String uploadType; + List datas; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostUdiInfoRequest.java new file mode 100644 index 0000000..d111492 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostUdiInfoRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.entity.sync.UdiInfoImportDetailEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostUdiInfoRequest { + private String genKey; + private List datas; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/WarehouseQueryRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/WarehouseQueryRequest.java new file mode 100644 index 0000000..0c986b5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/WarehouseQueryRequest.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.req.sync; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class WarehouseQueryRequest extends ListPageRequest { + + private String corpOrderId; + private String code; + private String udi; + private String batchNo; + private String orderId; + private String nameCode; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/PageSimpleResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/PageSimpleResponse.java new file mode 100644 index 0000000..9940519 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/PageSimpleResponse.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.res; + +import lombok.Data; + +import java.util.List; + +/** + * 简单的分页返回对象 + */ +@Data +public class PageSimpleResponse { + // 总数 + private Long total; + // 列表 + private List list; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java new file mode 100644 index 0000000..c3c4542 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminResponse.java @@ -0,0 +1,41 @@ +package com.glxp.sale.admin.res.auth; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 后台管理的 管理员管理页面的 VO + */ +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AuthAdminResponse { + + // 主键 + private Long id; + // 昵称 + private String userName; + // 登录密码 + private String passWord; + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date lastLoginTime; + // 创建时间 + private Date createTime; + // 状态 + private Integer userFlag; + + private Date lastModifyTime; + private String comments; + private String employeeName; + private long CustomerId; + // 角色ids + private List roles; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminRoleResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminRoleResponse.java new file mode 100644 index 0000000..1984b44 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthAdminRoleResponse.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.res.auth; + +import lombok.Data; + +/** + * 管理员页面的赛选的角色列表 + */ +@Data +public class AuthAdminRoleResponse { + + private Long id; + + private String name; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthPermissionRuleMergeResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthPermissionRuleMergeResponse.java new file mode 100644 index 0000000..73025b7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthPermissionRuleMergeResponse.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.res.auth; + +import lombok.Data; + +import java.util.List; + +/** + * 权限列表整合为多维数组的视图 + */ +@Data +public class AuthPermissionRuleMergeResponse { + + private Long id; + private Long pid; + private String name; + private String title; + private Long status; + private String condition; + private Long listorder; + + // 一次性加载所有权限规则生成 tree 树形节点时需要 + private List children; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthRoleResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthRoleResponse.java new file mode 100644 index 0000000..fa80f2b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/AuthRoleResponse.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.res.auth; + +import lombok.Data; + +/** + * 角色视图 + */ +@Data +public class AuthRoleResponse { + + private Long id; + private String name; + private Long pid; + private Long status; + private String remark; + private Long listorder; + private int isCustomer; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/CheckCodeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/CheckCodeRequest.java new file mode 100644 index 0000000..d5b61bc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/CheckCodeRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.res.auth; + +import lombok.Data; + +@Data +public class CheckCodeRequest { + private String phoneNum; + private String userName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java new file mode 100644 index 0000000..b44ba9b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.res.auth; + +import lombok.Data; + +import java.util.List; + +/** + * 登录用户的信息视图 + */ +@Data +public class LoginUserInfoResponse { + + private Long id; + private String userName; + private String employeeName; + private String avatar; + private Long CustomerId; + private String companyName; + // 权限列表 + private List authRules; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java new file mode 100644 index 0000000..a0edcc8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.res.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFModuleResponse { + + private int id; + private String name; + private String param; + private String fieldExplain; + private int templateId; + private String remark; + private Date create_time; + private Date update_time; + + private String templateName; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleSelectResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleSelectResponse.java new file mode 100644 index 0000000..586256a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleSelectResponse.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.res.param; + +import lombok.Data; + +@Data +public class SystemPDFModuleSelectResponse { + + private int id; + private String idStr; + private String name; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateResponse.java new file mode 100644 index 0000000..2725b1b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateResponse.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.res.param; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SystemPDFTemplateResponse { + + private int id; + private String name; + private int type; + private int module; + private String param; + private String path; + private int rowCount; + private int qrcodeCount; + private String remark; + private Date create_time; + private Date update_time; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateSelectResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateSelectResponse.java new file mode 100644 index 0000000..71bb649 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFTemplateSelectResponse.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.res.param; + +import lombok.Data; + +@Data +public class SystemPDFTemplateSelectResponse { + + private int id; + private String idStr; + private String name; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemParamConfigResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemParamConfigResponse.java new file mode 100644 index 0000000..4a60d64 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemParamConfigResponse.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.res.param; + +import lombok.Data; + +@Data +public class SystemParamConfigResponse { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/DlOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/DlOrderResponse.java new file mode 100644 index 0000000..35a29cd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/DlOrderResponse.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.res.sync; + +import com.glxp.sale.admin.entity.sync.ErpOrderEntity; +import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class DlOrderResponse { + private OrderEntity orderEntity; + private List orderDetails; + private List codes; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/ErpOrderResponse.java new file mode 100644 index 0000000..2aa2102 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/ErpOrderResponse.java @@ -0,0 +1,218 @@ +package com.glxp.sale.admin.res.sync; + +import java.util.List; + +public class ErpOrderResponse { + + private Integer id; + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private boolean signFlag; + private String billFlag; + private String unitIdFk; + private String originType; + private String customerId; + private List subErpOrders; + + public String getUnitIdFk() { + return unitIdFk; + } + + public void setUnitIdFk(String unitIdFk) { + this.unitIdFk = unitIdFk; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBillNo() { + return billNo; + } + + public void setBillNo(String billNo) { + this.billNo = billNo; + } + + public String getBilldate() { + return billdate; + } + + public void setBilldate(String billdate) { + this.billdate = billdate; + } + + public String getCorpId() { + return corpId; + } + + public void setCorpId(String corpId) { + this.corpId = corpId; + } + + public String getCorpName() { + return corpName; + } + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + public boolean isSignFlag() { + return signFlag; + } + + public void setSignFlag(boolean signFlag) { + this.signFlag = signFlag; + } + + public List getSubErpOrders() { + return subErpOrders; + } + + public void setSubErpOrders(List subErpOrders) { + this.subErpOrders = subErpOrders; + } + + public String getBillFlag() { + return billFlag; + } + + public void setBillFlag(String billFlag) { + this.billFlag = billFlag; + } + + public String getOriginType() { + return originType; + } + + public void setOriginType(String originType) { + this.originType = originType; + } + + public static class SubErpOrder { + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private int count; //账面数量 + private int reCount; //实际数量 + private String sweepCount; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getProductDate() { + return productDate; + } + + public void setProductDate(String productDate) { + this.productDate = productDate; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + public int getReCount() { + return reCount; + } + + public void setReCount(int reCount) { + this.reCount = reCount; + } + + public String getSweepCount() { + return sweepCount; + } + + public void setSweepCount(String sweepCount) { + this.sweepCount = sweepCount; + } + + public String getYlqxzcrbarmc() { + return ylqxzcrbarmc; + } + + public void setYlqxzcrbarmc(String ylqxzcrbarmc) { + this.ylqxzcrbarmc = ylqxzcrbarmc; + } + + public String getZczbhhzbapzbh() { + return zczbhhzbapzbh; + } + + public void setZczbhhzbapzbh(String zczbhhzbapzbh) { + this.zczbhhzbapzbh = zczbhhzbapzbh; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/ErpProductsResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/ErpProductsResponse.java new file mode 100644 index 0000000..44f9f62 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/ErpProductsResponse.java @@ -0,0 +1,31 @@ +package com.glxp.sale.admin.res.sync; + +import lombok.Data; + +@Data +public class ErpProductsResponse { + + private String code; //产品编码 + private String name; + private String measname; //计量单位 + private String spec; //规格型号 + private String registerNo; //注册证号 + private String manufactory; //生产厂家 + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; + + + + //辅助字段 + private boolean isChecked; + private String thirdSys; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/UdiRelevanceResponse.java new file mode 100644 index 0000000..bdd9ea0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/UdiRelevanceResponse.java @@ -0,0 +1,54 @@ +package com.glxp.sale.admin.res.sync; + +import lombok.Data; + +@Data +public class UdiRelevanceResponse { + + private int id; + private String thirdId; + private String thirdName; + private String uuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private int isUseDy; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + private String batchNo; + private String warehouseName; + private String thirdId1; + private String thirdName1; + private String thirdId2; + private String thirdName2; + private String thirdId3; + private String thirdName3; + private String thirdId4; + private String thirdName4; + private String ybbm; + private String sptm; + private Boolean isDisable; + private String erpId; + private String erpName; + private Integer productType; + private String mainId; + private String mainName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java new file mode 100644 index 0000000..df63f19 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.service.auth; + + +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.UpdateUserflagBean; +import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; + +import java.util.List; + +public interface AuthAdminService { + + List listAdminPage(AuthAdminQueryRequest authAdminQueryRequest); + + AuthAdmin findByUserName(String userName); + + AuthAdmin findByUser(String userName, String CustomerId); + + AuthAdmin findById(Long id); + + + AuthAdmin findPwdById(Long id); + + boolean insertAuthAdmin(AuthAdmin authAdmin); + + boolean updateAuthAdmin(AuthAdmin authAdmin); + + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthLoginService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthLoginService.java new file mode 100644 index 0000000..12d6bda --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthLoginService.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.service.auth; + +import java.util.List; + +public interface AuthLoginService { + + List listRuleByAdminId(Long adminId); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthPermissionRuleService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthPermissionRuleService.java new file mode 100644 index 0000000..0eb22f3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthPermissionRuleService.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.service.auth; + + +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; + +import java.util.List; + +public interface AuthPermissionRuleService { + + + List listByIdIn(List ids); + + + List listByPid(Long pid); + + List listAll(); + + boolean insertAuthPermissionRule(AuthPermissionRule authPermissionRule); + + boolean updateAuthPermissionRule(AuthPermissionRule authPermissionRule); + + boolean deleteById(Long id); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthPermissionService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthPermissionService.java new file mode 100644 index 0000000..536d661 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthPermissionService.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.service.auth; + + +import com.glxp.sale.admin.entity.auth.AuthPermission; + +import java.util.List; + +public interface AuthPermissionService { + + + List listByRoleIdIn(List roleIds); + + List listByRoleId(Long roleId); + + int insertAuthPermissionAll(List authPermissionList); + + boolean deleteByRoleId(Long roleId); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleAdminService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleAdminService.java new file mode 100644 index 0000000..a765a34 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleAdminService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.auth; + + +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; + +import java.util.List; + +public interface AuthRoleAdminService { + + List listByAdminId(Long adminId); + + List listByAdminIdIn(List adminIds); + + List listByRoleId(Long roleId); + + int insertAuthRoleAdminAll(List authRoleAdminList); + + int insertRolesAdminIdAll(List roles, Long adminId); + + boolean deleteByAdminId(Long adminId); + + List listAdminRole(Long adminId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java new file mode 100644 index 0000000..00155c2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthRoleService.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.service.auth; + + +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; + +import java.util.List; + +public interface AuthRoleService { + + List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest); + + List listAuthAdminRolePage(Integer page, Integer limit, Integer status); + + AuthRole findByName(String name); + + boolean insertAuthRole(AuthRole authRole); + + boolean updateAuthRole(AuthRole authRole); + + List listCustomerRoles(Integer page, Integer limit, Integer isCustomer); + + List listAuthRoles2(Integer page, Integer limit); + + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java new file mode 100644 index 0000000..a721db3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.service.auth; + +import com.glxp.sale.admin.entity.auth.CustomerDetailEntity; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; +import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; + +import java.util.List; + +public interface CustomerInfoService { + + List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); + + List filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest); + + boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity); + + boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); + boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity); + boolean deleteById(Long id); + + CustomerInfoEntity selectById(Long customerId); + CustomerDetailEntity selectDetail(Long customerId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java new file mode 100644 index 0000000..c2fea15 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/UserRegisterService.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.service.auth; + +import com.glxp.sale.admin.entity.auth.UserRegisterEntity; +import com.glxp.sale.admin.req.auth.UserResisterFilterRequest; + +import java.util.List; + +public interface UserRegisterService { + + List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest); + + boolean insertUserRegister(UserRegisterEntity userRegisterEntity); + + boolean updateUserRegister(UserRegisterEntity userRegisterEntity); + + boolean deleteById(Long id); + + UserRegisterEntity selectById(Integer id); + + UserRegisterEntity selectByMobile(String phone); + + boolean isExit(String phoneNum); + + boolean deleteByCustomerId(Long id); + + UserRegisterEntity selectByCustomerId(Long id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java new file mode 100644 index 0000000..9f1e77e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java @@ -0,0 +1,121 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.auth.AuthAdminDao; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.UpdateUserflagBean; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.common.enums.ResultEnum; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Service +public class AuthAdminServiceImpl implements AuthAdminService { + + @Resource + private AuthAdminDao authAdminDao; + + @Override + public List listAdminPage(AuthAdminQueryRequest authAdminQueryRequest) { + if (authAdminQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (authAdminQueryRequest.getPage() - 1) * authAdminQueryRequest.getLimit(); + PageHelper.offsetPage(offset, authAdminQueryRequest.getLimit()); + return authAdminDao.listAdminPage(authAdminQueryRequest); + } + + @Override + public AuthAdmin findByUserName(String userName) { + return authAdminDao.findByUserName(userName); + } + + @Override + public AuthAdmin findByUser(String userName, String CustomerId) { + return authAdminDao.findByUser(userName, CustomerId); + } + + /** + * 根据id 获取需要的info + * + * @param id + * @return + */ + @Override + public AuthAdmin findById(Long id) { + return authAdminDao.findById(id); + } + + /** + * 根据 id 获取密码字段 + * + * @param id + * @return + */ + @Override + public AuthAdmin findPwdById(Long id) { + return authAdminDao.findPwdById(id); + } + + /** + * 新增 + * + * @param authAdmin + * @return + */ + @Override + public boolean insertAuthAdmin(AuthAdmin authAdmin) { + + if (authAdmin.getUserName() != null) { + AuthAdmin byUserName = authAdminDao.findByUserName(authAdmin.getUserName()); + if (byUserName != null) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前用户已存在"); + } + } + authAdmin.setCreateTime(new Date()); + return authAdminDao.insertAuthAdmin(authAdmin); + } + + /** + * 更新 + * + * @param authAdmin + * @return + */ + @Override + public boolean updateAuthAdmin(AuthAdmin authAdmin) { + + if (authAdmin.getId() == null) { + return false; + } + // 当用户名不为空时，检查是否存在 + if (authAdmin.getUserName() != null) { + AuthAdmin byUserName = authAdminDao.findByUserName(authAdmin.getUserName()); + // 判断是否存在，剔除自己 + if (byUserName != null && !authAdmin.getId().equals(byUserName.getId())) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前管理员已存在"); + } + } + + return authAdminDao.updateAuthAdmin(authAdmin); + } + + /** + * 根据id删除 + * + * @param id + * @return + */ + @Override + public boolean deleteById(Long id) { + return authAdminDao.deleteById(id); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java new file mode 100644 index 0000000..669c4e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java @@ -0,0 +1,81 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.admin.entity.auth.AuthPermission; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; +import com.glxp.sale.admin.service.auth.AuthLoginService; +import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; +import com.glxp.sale.admin.service.auth.AuthPermissionService; +import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class AuthLoginServiceImpl implements AuthLoginService { + + @Resource + private AuthRoleAdminService authRoleAdminService; + + @Resource + private AuthPermissionService authPermissionService; + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + + /** + * 根据 管理员id 获取权限 + * @param adminId + * @return + */ + @Override + public List listRuleByAdminId(Long adminId) { + + List authRules = new ArrayList<>(); + // 超级管理员 + if (adminId.equals(1L)) { + authRules.add("admin"); + return authRules; + } + + // 如果存在，先从缓存中获取权限 +// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); +// if (CacheUtils.hasKey(aarKey)) { +// return new ArrayList<>(CacheUtils.sGetMembers(aarKey)); +// } +// log.info("开始获取数据库中的用户的权限规则列表"); + + // 获取角色ids + List authRoleAdmins = authRoleAdminService.listByAdminId(adminId); + + List roleIds = authRoleAdmins.stream().map(AuthRoleAdmin::getRole_id).collect(Collectors.toList()); + + // 角色授权列表 + List authPermissions = authPermissionService.listByRoleIdIn(roleIds); + List permissionRuleIds = authPermissions.stream().map(AuthPermission::getPermissionRuleId).collect(Collectors.toList()); + + // 获取授权的规则 + List authPermissionRules = authPermissionRuleService.listByIdIn(permissionRuleIds); + + // 获取权限列表 + authRules = authPermissionRules.stream().map(AuthPermissionRule::getName).collect(Collectors.toList()); + + // 如果为空，则添加一个空值 + if (authRules.isEmpty()) { + authRules.add(""); + } + +// String[] strings = authRules.toArray(new String[0]); +// CacheUtils.sAdd(aarKey, strings); +// CacheUtils.expire(aarKey, 7200L); // 两小时后过期 + + return authRules; + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java new file mode 100644 index 0000000..9953e49 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java @@ -0,0 +1,110 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.admin.dao.auth.AuthPermissionRuleDao; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; +import com.glxp.sale.common.enums.ResultEnum; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +/** + * + */ +@Service +public class AuthPermissionRuleServiceImpl implements AuthPermissionRuleService { + + @Resource + private AuthPermissionRuleDao authPermissionRuleDao; + + /** + * 根据多个id查询 + * + * @param ids + * @return + */ + @Override + public List listByIdIn(List ids) { + if (ids.isEmpty()) { + return Collections.emptyList(); + } + return authPermissionRuleDao.listByIdIn(ids); + } + + /** + * 根据父级 pid 查询 + * + * @param pid + * @return + */ + @Override + public List listByPid(Long pid) { + return authPermissionRuleDao.listByPid(pid); + } + + /** + * 查询所有 + * @return + */ + @Override + public List listAll() { + return authPermissionRuleDao.listAll(); + } + + /** + * 插入 + * @param authPermissionRule + * @return + */ + @Override + public boolean insertAuthPermissionRule(AuthPermissionRule authPermissionRule) { + + // 查询是否存在 + AuthPermissionRule byName = authPermissionRuleDao.findByName(authPermissionRule.getName()); + if (byName != null) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前权限规则已存在"); + } + + authPermissionRule.setCreateTime(new Date()); + authPermissionRule.setUpdateTime(new Date()); + if (authPermissionRule.getListorder() == null) { + authPermissionRule.setListorder(999); + } + return authPermissionRuleDao.insertAuthPermissionRule(authPermissionRule); + } + + /** + * 更新 + * @param authPermissionRule + * @return + */ + @Override + public boolean updateAuthPermissionRule(AuthPermissionRule authPermissionRule) { + + if (authPermissionRule.getName() != null) { + // 查询是否存在 + AuthPermissionRule byName = authPermissionRuleDao.findByName(authPermissionRule.getName()); + if (byName != null && !authPermissionRule.getId().equals(byName.getId())) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前权限规则已存在"); + } + } + + authPermissionRule.setUpdateTime(new Date()); + return authPermissionRuleDao.updateAuthPermissionRule(authPermissionRule); + } + + /** + * 删除 + * + * @param id + * @return + */ + @Override + public boolean deleteById(Long id) { + return authPermissionRuleDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionServiceImpl.java new file mode 100644 index 0000000..8d5a2fa --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionServiceImpl.java @@ -0,0 +1,60 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.admin.dao.auth.AuthPermissionDao; +import com.glxp.sale.admin.entity.auth.AuthPermission; +import com.glxp.sale.admin.service.auth.AuthPermissionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class AuthPermissionServiceImpl implements AuthPermissionService { + + @Resource + private AuthPermissionDao authPermissionDao; + + /** + * 根据 多个角色id 查询 + * @param roleIds + * @return + */ + @Override + public List listByRoleIdIn(List roleIds) { + if (roleIds.isEmpty()) { + return Collections.emptyList(); + } + return authPermissionDao.listByRoleIdIn(roleIds); + } + + /** + * 根据某个角色id 查询 + * @param roleId + * @return + */ + @Override + public List listByRoleId(Long roleId) { + return authPermissionDao.listByRoleId(roleId); + } + + /** + * 批量插入 + * @param authPermissionList + * @return + */ + @Override + public int insertAuthPermissionAll(List authPermissionList) { + return authPermissionDao.insertAuthPermissionAll(authPermissionList); + } + + /** + * 根据角色id删除 + * @param roleId + * @return + */ + @Override + public boolean deleteByRoleId(Long roleId) { + return authPermissionDao.deleteByRoleId(roleId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleAdminServiceImpl.java new file mode 100644 index 0000000..06fa64b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -0,0 +1,115 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.admin.dao.auth.AuthRoleAdminDao; +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; +import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class AuthRoleAdminServiceImpl implements AuthRoleAdminService { + + @Resource + private AuthRoleAdminDao authRoleAdminDao; + + /** + * 根据 adminid 获取角色id + * + * @param adminId + * @return + */ + @Override + public List listByAdminId(Long adminId) { + return authRoleAdminDao.listByAdminId(adminId); + } + + /** + * 根据多个 adminId 查询角色列表 + * + * @param adminIds + * @return + */ + @Override + public List listByAdminIdIn(List adminIds) { + if (adminIds.isEmpty()) { + return Collections.emptyList(); + } + return authRoleAdminDao.listByAdminIdIn(adminIds); + } + + /** + * 根据 roleId 获取 管理员id + * + * @param roleId + * @return + */ + @Override + public List listByRoleId(Long roleId) { + return authRoleAdminDao.listByRoleId(roleId); + } + + /** + * 批量插入 + * + * @param authRoleAdminList + * @return + */ + @Override + public int insertAuthRoleAdminAll(List authRoleAdminList) { + + if (authRoleAdminList == null || authRoleAdminList.isEmpty()) { + return 0; + } + + return authRoleAdminDao.insertAuthRoleAdminAll(authRoleAdminList); + } + + /** + * 根据 角色ids 和 管理员 adminId 批量插入 + * + * @param roles + * @param adminId + * @return + */ + @Override + public int insertRolesAdminIdAll(List roles, Long adminId) { + + List authRoleAdminList = roles.stream().map(aLong -> { + AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); + authRoleAdmin.setRole_id(aLong); + authRoleAdmin.setAdmin_id(adminId); + return authRoleAdmin; + }).collect(Collectors.toList()); + if (!authRoleAdminList.isEmpty()) { + return insertAuthRoleAdminAll(authRoleAdminList); + } + + return 0; + } + + /** + * 根据 adminId 删除对应的权限 + * + * @param adminId + * @return + */ + @Override + public boolean deleteByAdminId(Long adminId) { + +// // 删除之前缓存权限规则 +// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); +// CacheUtils.delete(aarKey); + + return authRoleAdminDao.deleteByAdminId(adminId); + } + + @Override + public List listAdminRole(Long adminId) { + return authRoleAdminDao.listAdminRole(adminId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java new file mode 100644 index 0000000..aa20358 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImpl.java @@ -0,0 +1,113 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.auth.AuthRoleDao; +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; +import com.glxp.sale.admin.service.auth.AuthRoleService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Service +public class AuthRoleServiceImpl implements AuthRoleService { + + @Resource + private AuthRoleDao authRoleDao; + + /** + * 查询列表 + * @return + */ + @Override + public List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) { + int offset = (authRoleQueryRequest.getPage() - 1) * authRoleQueryRequest.getLimit(); + PageHelper.offsetPage(offset, authRoleQueryRequest.getLimit()); + List list = authRoleDao.listAdminPage(authRoleQueryRequest); + return list; + } + + /** + * 查询管理员页面的列表 + * @param page + * @param limit + * @param status + * @return + */ + @Override + public List listAuthAdminRolePage(Integer page, Integer limit, Integer status) { + page = page != null && page > 0 ? page : 1; + limit = limit != null && limit > 0 && limit < 100 ? limit : 100; + int offset = (page - 1) * limit; + PageHelper.offsetPage(offset, limit); + List list = authRoleDao.listAuthAdminRolePage(status); + return list; + } + + /** + * 根据名称查询 + * @param name + * @return + */ + @Override + public AuthRole findByName(String name) { + return authRoleDao.findByName(name); + } + + /** + * 插入 + * @param authRole + * @return + */ + @Override + public boolean insertAuthRole(AuthRole authRole) { + + authRole.setCreateTime(new Date()); + authRole.setUpdateTime(new Date()); + + return authRoleDao.insertAuthRole(authRole); + } + + /** + * 修改 + * @param authRole + * @return + */ + @Override + public boolean updateAuthRole(AuthRole authRole) { + authRole.setUpdateTime(new Date()); + return authRoleDao.updateAuthRole(authRole); + } + + @Override + public List listCustomerRoles(Integer page, Integer limit, Integer isCustomer) { + page = page != null && page > 0 ? page : 1; + limit = limit != null && limit > 0 && limit < 100 ? limit : 100; + int offset = (page - 1) * limit; + PageHelper.offsetPage(offset, limit); + List list = authRoleDao.listCustomerRoles(isCustomer); + return list; + } + + @Override + public List listAuthRoles2(Integer page, Integer limit) { + page = page != null && page > 0 ? page : 1; + limit = limit != null && limit > 0 && limit < 100 ? limit : 100; + int offset = (page - 1) * limit; + PageHelper.offsetPage(offset, limit); + List list = authRoleDao.listAuthRoles2(); + return list; + } + + /** + * 删除 + * @param id + * @return + */ + @Override + public boolean deleteById(Long id) { + return authRoleDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerContactService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerContactService.java new file mode 100644 index 0000000..68e9348 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerContactService.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.service.auth.impl; + + +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.req.auth.CustomerContactFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; + +import java.util.List; + +public interface CustomerContactService { + + List filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest); + + boolean insertCustomerContact(CustomerContactEntity customerContactEntity); + + boolean updateCustomerContact(CustomerContactEntity customerContactEntity); + + boolean deleteById(Long id); + + boolean deleteContact(DeleteRequest deleteRequest); + + CustomerContactEntity selectById(Long emailId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerContactServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerContactServiceImpl.java new file mode 100644 index 0000000..56e7642 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerContactServiceImpl.java @@ -0,0 +1,56 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.auth.CustomerContacDao; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.req.auth.CustomerContactFilterRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CustomerContactServiceImpl implements CustomerContactService { + + + @Resource + private CustomerContacDao customerContacDao; + + @Override + public List filterCustomerContact(CustomerContactFilterRequest customerContactFilterRequest) { + if (customerContactFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (customerContactFilterRequest.getPage() - 1) * customerContactFilterRequest.getLimit(); + PageHelper.offsetPage(offset, customerContactFilterRequest.getLimit()); + return customerContacDao.filterCustomerContact(customerContactFilterRequest); + } + + @Override + public boolean insertCustomerContact(CustomerContactEntity customerContactEntity) { + return customerContacDao.insertCustomerContact(customerContactEntity); + } + + @Override + public boolean updateCustomerContact(CustomerContactEntity customerContactEntity) { + return customerContacDao.updateCustomerContact(customerContactEntity); + } + + @Override + public boolean deleteById(Long id) { + return customerContacDao.deleteById(id); + } + + @Override + public boolean deleteContact(DeleteRequest deleteRequest) { + return customerContacDao.deleteContact(deleteRequest); + } + + + @Override + public CustomerContactEntity selectById(Long emailId) { + return customerContacDao.selectById(emailId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java new file mode 100644 index 0000000..142d74a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java @@ -0,0 +1,92 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.auth.AuthAdminDao; +import com.glxp.sale.admin.dao.auth.CustomerContacDao; +import com.glxp.sale.admin.dao.auth.CustomerInfoDao; +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.auth.CustomerDetailEntity; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; +import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; +import com.glxp.sale.admin.service.auth.AuthRoleService; +import com.glxp.sale.admin.service.auth.CustomerInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CustomerInfoServiceImpl implements CustomerInfoService { + + + @Resource + private CustomerInfoDao customerInfoDao; + + @Resource + private CustomerContacDao customerContacDao; + + @Resource + private AuthAdminDao authAdminDao; + + @Resource + private AuthRoleService authRoleService; + + @Override + public List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest) { + if (customerInfoFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit()); + return customerInfoDao.filterCustomerInfo(customerInfoFilterRequest); + } + + @Override + public List filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest) { + if (customerInfoFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit()); + List customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest); + for (int i = 0; i < customerDetailEntities.size(); i++) { + CustomerDetailEntity customerDetailEntity = customerDetailEntities.get(i); + if(!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId()!=null ){ + + } + + } + return customerDetailEntities; + } + + @Override + public boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity) { + return customerInfoDao.insertCustomerInfo(customerInfoEntity); + } + + @Override + public boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity) { + return customerInfoDao.updateCustomerInfo(customerInfoEntity); + } + + @Override + public boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity) { + return false; + } + + @Override + public boolean deleteById(Long id) { + return customerInfoDao.deleteById(id); + } + + @Override + public CustomerInfoEntity selectById(Long customerId) { + return customerInfoDao.selectById(customerId); + } + + @Override + public CustomerDetailEntity selectDetail(Long customerId) { + return customerInfoDao.selectDetail(customerId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java new file mode 100644 index 0000000..60b2ae9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/UserRegisterServiceImpl.java @@ -0,0 +1,75 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.auth.UserRegisterDao; +import com.glxp.sale.admin.entity.auth.UserRegisterEntity; +import com.glxp.sale.admin.req.auth.UserResisterFilterRequest; +import com.glxp.sale.admin.service.auth.UserRegisterService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UserRegisterServiceImpl implements UserRegisterService { + + @Resource + private UserRegisterDao userRegisterDao; + + + @Override + public List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest) { + if (userResisterFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (userResisterFilterRequest.getPage() - 1) * userResisterFilterRequest.getLimit(); + PageHelper.offsetPage(offset, userResisterFilterRequest.getLimit()); + return userRegisterDao.filterUserRegisters(userResisterFilterRequest); + } + + @Override + public boolean insertUserRegister(UserRegisterEntity userRegisterEntity) { + return userRegisterDao.insertUserRegister(userRegisterEntity); + } + + @Override + public boolean updateUserRegister(UserRegisterEntity userRegisterEntity) { + return userRegisterDao.updateUserRegister(userRegisterEntity); + } + + @Override + public boolean deleteById(Long id) { + return userRegisterDao.deleteById(id); + } + + + @Override + public UserRegisterEntity selectById(Integer id) { + return userRegisterDao.selectById(id); + } + + @Override + public UserRegisterEntity selectByMobile(String phone) { + return userRegisterDao.selectByMobile(phone); + } + + @Override + public boolean isExit(String phoneNum) { + String data = userRegisterDao.isExit(phoneNum); + if (data != null) + return true; + else + return false; + } + + @Override + public boolean deleteByCustomerId(Long id) { + return userRegisterDao.deleteByCustomerId(id); + } + + @Override + public UserRegisterEntity selectByCustomerId(Long id) { + return userRegisterDao.selectByCustomerId(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/package-info.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/package-info.java new file mode 100644 index 0000000..4e2a588 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/package-info.java @@ -0,0 +1 @@ +package com.glxp.sale.admin.service.auth; \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/AliCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/AliCertService.java new file mode 100644 index 0000000..9dddabb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/AliCertService.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.AliCertEntity; +import com.glxp.sale.admin.req.info.DeleteAliCertRequest; +import com.glxp.sale.admin.req.info.FilterAliCertRequest; + +import java.util.List; + +public interface AliCertService { + + boolean insertAliCert(AliCertEntity aliCertEntity); + + boolean insertAliCertList(List aliCertEntities); + + List filterAliCert(FilterAliCertRequest filterAliCertRequest); + + boolean deleteAliCert(DeleteAliCertRequest deleteAliCertRequest); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/ApilogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/ApilogService.java new file mode 100644 index 0000000..2908d6e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/ApilogService.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.ApilogEntity; +import com.glxp.sale.admin.req.info.DeleteApilogRequest; + +public interface ApilogService { + + boolean insertApilog(ApilogEntity apilogEntity); + + boolean updateApilog(ApilogEntity apilogEntity); + + boolean deleteApilog(DeleteApilogRequest deleteApilogRequest); + + boolean addApilog(ApilogEntity apilogEntity); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java new file mode 100644 index 0000000..86465a9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; + +import java.util.List; + +public interface CompanyCertService { + + List filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest); + + CompanyCertEntity findCompanyCert(Long CustomerId); + + CompanyCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest); + + boolean updateCompanyCert(CompanyCertEntity companyCertEntity); + + boolean insertCompanyCert(CompanyCertEntity companyCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java new file mode 100644 index 0000000..e1f167c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanRequest; + +import java.util.List; + +public interface CompanySalesmanService { + + List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + CompanySalesmanEntity findCompanySalesman(Long CustomerId); + + CompanySalesmanEntity findCompanySalesmanByName(String name); + + List getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); + + boolean updateCompanySalesman(CompanySalesmanEntity companyCertEntity); + + boolean insertCompanySalesman(CompanySalesmanEntity companyCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java new file mode 100644 index 0000000..2154d20 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.entity.info.CompanySalesmanUpdateLogEntity; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanRequest; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanUpdateLogRequest; + +import java.util.List; + +public interface CompanySalesmanUpdateLogService { + + List filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest); + + CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId); + + CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit); + + List getCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest); + + boolean updateCompanySalesmanUpdateLog(CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity); + + boolean insertCompanySalesmanUpdateLog(CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java new file mode 100644 index 0000000..2af0918 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.AliKeyEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.req.info.FilterCompanyRequest; + +import java.util.List; + +public interface CompanyService { + + CompanyEntity findCompany(Long CustomerId); + + List getSubCompany(FilterCompanyRequest commitRequest); + + List getSubCompany2(FilterCompanyRequest commitRequest); + + CompanyEntity findCompanyByName(String companyName); + + boolean modifyCompany(CompanyEntity companyEntity); + + boolean insertCompany(CompanyEntity companyEntity); + + AliKeyEntity findKey(String customerId); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java new file mode 100644 index 0000000..bdb4850 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.CompanySalesmanUpdateLogEntity; +import com.glxp.sale.admin.entity.info.CompanyUpdateLogEntity; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanUpdateLogRequest; +import com.glxp.sale.admin.req.info.FilterCompanyUpdateLogRequest; + +import java.util.List; + +public interface CompanyUpdateLogService { + + List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId); + + CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit); + + List getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); + + boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/DeviceKeyService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/DeviceKeyService.java new file mode 100644 index 0000000..062e928 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/DeviceKeyService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.DeviceKeyEntity; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest; + +import java.util.List; + +public interface DeviceKeyService { + List findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest); + DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest); + void insertDeviceKey(DeviceKeyEntity deviceKeyEntity); + + void updateDeviceKeyByImei(DeviceKeyEntity deviceKeyEntity); + + void updateDeviceKey(DeviceKeyEntity deviceKeyEntity); + + void deleteDeviceKey(DeleteRequest deleteRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/SetupService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SetupService.java new file mode 100644 index 0000000..c5c2bd7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SetupService.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.SetupEntity; + +public interface SetupService { + + SetupEntity findSetup(String CustomerId); + + boolean modifySetup(SetupEntity setupEntity); + + boolean insertSetup(SetupEntity setupEntity); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersEnterpriseBasicCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersEnterpriseBasicCertService.java new file mode 100644 index 0000000..b5a36c4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersEnterpriseBasicCertService.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; +import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; +import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SuppliersEnterpriseBasicCertService { + + List filterCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest); + + SupplierEnterpriseBasicCertEntity findCompanyCert(Long enterpriseId); + + SupplierEnterpriseBasicCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest); + + boolean updateCompanyCert(SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity); + + boolean insertCompanyCert(SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity); + + boolean deleteById(String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersEnterpriseBasicService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersEnterpriseBasicService.java new file mode 100644 index 0000000..996e368 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersEnterpriseBasicService.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.service.info; + + +import com.glxp.sale.admin.entity.info.SuppliersEnterpriseBasicEntity; +import com.glxp.sale.admin.req.info.SuppliersEnterpriseBasicRequest; + +import java.util.List; + +public interface SuppliersEnterpriseBasicService { + + SuppliersEnterpriseBasicEntity findCompany(Long id); + + SuppliersEnterpriseBasicEntity findCompanyByName(String companyName); + + List getCompany(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest); + + boolean modifyCompany(SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity); + + boolean insertCompany(SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersRegistrationBasicService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersRegistrationBasicService.java new file mode 100644 index 0000000..e226222 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/SuppliersRegistrationBasicService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; +import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SuppliersRegistrationBasicService { + + SuppliersRegistrationBasicEntity findRegistration(Long id); + + SuppliersRegistrationBasicEntity findRegistrationByName(String recordProductName); + + List getRegistration(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest); + + boolean modifyRegistration(SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity); + + boolean insertRegistration(SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/AliCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/AliCertServiceImpl.java new file mode 100644 index 0000000..700e514 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/AliCertServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.glxp.sale.admin.dao.info.AliCertDao; +import com.glxp.sale.admin.entity.info.AliCertEntity; +import com.glxp.sale.admin.req.info.DeleteAliCertRequest; +import com.glxp.sale.admin.req.info.FilterAliCertRequest; +import com.glxp.sale.admin.service.info.AliCertService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class AliCertServiceImpl implements AliCertService { + + + @Resource + AliCertDao aliCertDao; + + @Override + public boolean insertAliCert(AliCertEntity aliCertEntity) { + return aliCertDao.insertAliCert(aliCertEntity); + } + + @Override + public boolean insertAliCertList(List aliCertEntities) { + return aliCertDao.insertAliCertList(aliCertEntities); + } + + @Override + public List filterAliCert(FilterAliCertRequest filterAliCertRequest) { + return aliCertDao.filterAliCert(filterAliCertRequest); + } + + @Override + public boolean deleteAliCert(DeleteAliCertRequest deleteAliCertRequest) { + return aliCertDao.deleteAliCert(deleteAliCertRequest); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ApilogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ApilogServiceImpl.java new file mode 100644 index 0000000..96856cf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ApilogServiceImpl.java @@ -0,0 +1,35 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.glxp.sale.admin.dao.info.ApilogDao; +import com.glxp.sale.admin.entity.info.ApilogEntity; +import com.glxp.sale.admin.req.info.DeleteApilogRequest; +import com.glxp.sale.admin.service.info.ApilogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +@Service +public class ApilogServiceImpl implements ApilogService { + + @Resource + ApilogDao apilogDao; + + @Override + public boolean insertApilog(ApilogEntity apilogEntity) { + return apilogDao.insertApilog(apilogEntity); + } + + @Override + public boolean updateApilog(ApilogEntity apilogEntity) { + return apilogDao.updateApilog(apilogEntity); + } + + @Override + public boolean deleteApilog(DeleteApilogRequest deleteApilogRequest) { + return apilogDao.deleteApilog(deleteApilogRequest); + } + + @Override + public boolean addApilog(ApilogEntity apilogEntity) { + return apilogDao.addApilog(apilogEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java new file mode 100644 index 0000000..0824c9f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.CompanyCertDao; +import com.glxp.sale.admin.entity.info.CompanyCertEntity; +import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; +import com.glxp.sale.admin.service.info.CompanyCertService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanyCertServiceImpl implements CompanyCertService { + + @Resource + CompanyCertDao companyCertDao; + + @Override + public List filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest) { + if (filterCompanyCertRequest == null) { + return Collections.emptyList(); + } + if (filterCompanyCertRequest.getPage() != null) { + int offset = (filterCompanyCertRequest.getPage() - 1) * filterCompanyCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyCertRequest.getLimit()); + } + return companyCertDao.filterCompanyCert(filterCompanyCertRequest); + } + + @Override + public CompanyCertEntity findCompanyCert(Long CustomerId) { + return companyCertDao.findCompanyCert(CustomerId); + } + + @Override + public List getCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest) { + if (filterCompanyCertRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanyCertRequest.getPage() - 1) * filterCompanyCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyCertRequest.getLimit()); + List companyEntities = companyCertDao.getCompanyCert(filterCompanyCertRequest); + return companyEntities; + } + + @Override + public CompanyCertEntity findCompanyCertByName(String companyName) { + return companyCertDao.findCompanyCertByName(companyName); + } + + @Override + public boolean updateCompanyCert(CompanyCertEntity companyCertEntity) { + return companyCertDao.updateCompanyCert(companyCertEntity); + } + + @Override + public boolean insertCompanyCert(CompanyCertEntity companyCertEntity) { + return companyCertDao.insertCompanyCert(companyCertEntity); + } + + @Override + public boolean deleteById(String id) { + return companyCertDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java new file mode 100644 index 0000000..54461bd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.CompanySalesmanDao; +import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanRequest; +import com.glxp.sale.admin.service.info.CompanySalesmanService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanySalesmanServiceImpl implements CompanySalesmanService { + + @Resource + CompanySalesmanDao companySalesmanDao; + + @Override + public List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { + if (filterCompanySalesmanRequest == null) { + return Collections.emptyList(); + } + if (filterCompanySalesmanRequest.getPage() != null) { + int offset = (filterCompanySalesmanRequest.getPage() - 1) * filterCompanySalesmanRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanySalesmanRequest.getLimit()); + } + return companySalesmanDao.filterCompanySalesman(filterCompanySalesmanRequest); + } + + @Override + public CompanySalesmanEntity findCompanySalesman(Long CustomerId) { + return companySalesmanDao.findCompanySalesman(CustomerId); + } + + @Override + public List getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { + if (filterCompanySalesmanRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanySalesmanRequest.getPage() - 1) * filterCompanySalesmanRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanySalesmanRequest.getLimit()); + List companyEntities = companySalesmanDao.getCompanySalesman(filterCompanySalesmanRequest); + return companyEntities; + } + + @Override + public CompanySalesmanEntity findCompanySalesmanByName(String companyName) { + return companySalesmanDao.findCompanySalesmanByName(companyName); + } + + @Override + public boolean updateCompanySalesman(CompanySalesmanEntity companySalesmanEntity) { + return companySalesmanDao.updateCompanySalesman(companySalesmanEntity); + } + + @Override + public boolean insertCompanySalesman(CompanySalesmanEntity companySalesmanEntity) { + return companySalesmanDao.insertCompanySalesman(companySalesmanEntity); + } + + @Override + public boolean deleteById(String id) { + return companySalesmanDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java new file mode 100644 index 0000000..6aa36ad --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.CompanySalesmanUpdateLogDao; +import com.glxp.sale.admin.entity.info.CompanySalesmanUpdateLogEntity; +import com.glxp.sale.admin.req.info.FilterCompanySalesmanUpdateLogRequest; +import com.glxp.sale.admin.service.info.CompanySalesmanUpdateLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanySalesmanUpdateLogServiceImpl implements CompanySalesmanUpdateLogService { + + @Resource + CompanySalesmanUpdateLogDao companySalesmanUpdateLogDao; + + @Override + public List filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest) { + if (filterCompanySalesmanUpdateLogRequest == null) { + return Collections.emptyList(); + } + if (filterCompanySalesmanUpdateLogRequest.getPage() != null) { + int offset = (filterCompanySalesmanUpdateLogRequest.getPage() - 1) * filterCompanySalesmanUpdateLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanySalesmanUpdateLogRequest.getLimit()); + } + return companySalesmanUpdateLogDao.filterCompanySalesmanUpdateLog(filterCompanySalesmanUpdateLogRequest); + } + + @Override + public CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId) { + return companySalesmanUpdateLogDao.findCompanySalesmanUpdateLog(CustomerId); + } + + @Override + public List getCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest) { + if (filterCompanySalesmanUpdateLogRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanySalesmanUpdateLogRequest.getPage() - 1) * filterCompanySalesmanUpdateLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanySalesmanUpdateLogRequest.getLimit()); + List companyEntities = companySalesmanUpdateLogDao.getCompanySalesmanUpdateLog(filterCompanySalesmanUpdateLogRequest); + return companyEntities; + } + + @Override + public CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit) { + return companySalesmanUpdateLogDao.findCompanySalesmanUpdateLogBySubmit(submit); + } + + @Override + public boolean updateCompanySalesmanUpdateLog(CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity) { + return companySalesmanUpdateLogDao.updateCompanySalesmanUpdateLog(companySalesmanUpdateLogEntity); + } + + @Override + public boolean insertCompanySalesmanUpdateLog(CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity) { + return companySalesmanUpdateLogDao.insertCompanySalesmanUpdateLog(companySalesmanUpdateLogEntity); + } + + @Override + public boolean deleteById(String id) { + return companySalesmanUpdateLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..436f683 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.CompanyDao; +import com.glxp.sale.admin.entity.info.AliKeyEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.req.info.FilterCompanyRequest; +import com.glxp.sale.admin.service.info.CompanyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanyServiceImpl implements CompanyService { + + @Resource + CompanyDao companyDao; + + @Override + public CompanyEntity findCompany(Long CustomerId) { + return companyDao.findCompany(CustomerId); + } + + @Override + public List getSubCompany(FilterCompanyRequest commitRequest) { + if (commitRequest == null) { + return Collections.emptyList(); + } + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + List companyEntities = companyDao.getSubCompany(commitRequest); + return companyEntities; + } + + @Override + public List getSubCompany2(FilterCompanyRequest commitRequest) { + if (commitRequest == null) { + return Collections.emptyList(); + } + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + List companyEntities = companyDao.getSubCompany2(commitRequest); + return companyEntities; + } + + @Override + public CompanyEntity findCompanyByName(String companyName) { + return companyDao.findCompanyByName(companyName); + } + + @Override + public boolean modifyCompany(CompanyEntity companyEntity) { + return companyDao.modifyCompany(companyEntity); + } + + @Override + public boolean insertCompany(CompanyEntity companyEntity) { + return companyDao.insertCompany(companyEntity); + } + + @Override + public AliKeyEntity findKey(String customerId) { + return companyDao.findKey(customerId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java new file mode 100644 index 0000000..1d887e3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.CompanyUpdateLogDao; +import com.glxp.sale.admin.entity.info.CompanyUpdateLogEntity; +import com.glxp.sale.admin.req.info.FilterCompanyUpdateLogRequest; +import com.glxp.sale.admin.service.info.CompanyUpdateLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CompanyUpdateLogServiceImpl implements CompanyUpdateLogService { + + @Resource + CompanyUpdateLogDao companyUpdateLogDao; + + @Override + public List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { + if (filterCompanyUpdateLogRequest == null) { + return Collections.emptyList(); + } + if (filterCompanyUpdateLogRequest.getPage() != null) { + int offset = (filterCompanyUpdateLogRequest.getPage() - 1) * filterCompanyUpdateLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyUpdateLogRequest.getLimit()); + } + return companyUpdateLogDao.filterCompanyUpdateLog(filterCompanyUpdateLogRequest); + } + + @Override + public CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId) { + return companyUpdateLogDao.findCompanyUpdateLog(CustomerId); + } + + @Override + public List getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { + if (filterCompanyUpdateLogRequest == null) { + return Collections.emptyList(); + } + int offset = (filterCompanyUpdateLogRequest.getPage() - 1) * filterCompanyUpdateLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterCompanyUpdateLogRequest.getLimit()); + List companyEntities = companyUpdateLogDao.getCompanyUpdateLog(filterCompanyUpdateLogRequest); + return companyEntities; + } + + @Override + public CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit) { + return companyUpdateLogDao.findCompanyUpdateLogBySubmit(submit); + } + + @Override + public boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity) { + return companyUpdateLogDao.updateCompanyUpdateLog(companyUpdateLogEntity); + } + + @Override + public boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity) { + return companyUpdateLogDao.insertCompanyUpdateLog(companyUpdateLogEntity); + } + + @Override + public boolean deleteById(String id) { + return companyUpdateLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/DeviceKeyServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/DeviceKeyServiceImpl.java new file mode 100644 index 0000000..c8b7fe8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/DeviceKeyServiceImpl.java @@ -0,0 +1,55 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.DeviceKeyDao; +import com.glxp.sale.admin.entity.info.DeviceKeyEntity; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest; +import com.glxp.sale.admin.service.info.DeviceKeyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class DeviceKeyServiceImpl implements DeviceKeyService { + + @Resource + DeviceKeyDao deviceKeyDao; + + @Override + public List findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest) { + if (filterDeviceKeyRequest == null) { + return Collections.emptyList(); + } + int offset = (filterDeviceKeyRequest.getPage() - 1) * filterDeviceKeyRequest.getLimit(); + PageHelper.offsetPage(offset, filterDeviceKeyRequest.getLimit()); + return deviceKeyDao.findDeviceKey(filterDeviceKeyRequest); + } + + @Override + public DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest) { + return deviceKeyDao.findDeviceByImei(filterDeviceKeyRequest); + } + + @Override + public void insertDeviceKey(DeviceKeyEntity deviceKeyEntity) { + deviceKeyDao.insertDeviceKey(deviceKeyEntity); + } + + @Override + public void updateDeviceKeyByImei(DeviceKeyEntity deviceKeyEntity) { + deviceKeyDao.updateDeviceKeyByImei(deviceKeyEntity); + } + + @Override + public void updateDeviceKey(DeviceKeyEntity deviceKeyEntity) { + deviceKeyDao.updateDeviceKey(deviceKeyEntity); + } + + @Override + public void deleteDeviceKey(DeleteRequest deleteRequest) { + deviceKeyDao.deleteDeviceKey(deleteRequest); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SetupServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SetupServiceImpl.java new file mode 100644 index 0000000..094b78c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SetupServiceImpl.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.glxp.sale.admin.dao.info.SetupDao; +import com.glxp.sale.admin.entity.info.SetupEntity; +import com.glxp.sale.admin.service.info.SetupService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class SetupServiceImpl implements SetupService { + @Resource + SetupDao setupDao; + + @Override + public SetupEntity findSetup(String customerId) { + return setupDao.findSetup(customerId); + } + + @Override + public boolean modifySetup(SetupEntity setupEntity) { + return setupDao.modifySetup(setupEntity); + } + + @Override + public boolean insertSetup(SetupEntity setupEntity) { + return setupDao.insertSetup(setupEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersEnterpriseBasicServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersEnterpriseBasicServiceImpl.java new file mode 100644 index 0000000..358573b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersEnterpriseBasicServiceImpl.java @@ -0,0 +1,55 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.SuppliersEnterpriseBasicDao; +import com.glxp.sale.admin.entity.info.SuppliersEnterpriseBasicEntity; +import com.glxp.sale.admin.req.info.SuppliersEnterpriseBasicRequest; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SuppliersEnterpriseBasicServiceImpl implements SuppliersEnterpriseBasicService { + + @Resource + SuppliersEnterpriseBasicDao suppliersEnterpriseBasicDao; + + @Override + public SuppliersEnterpriseBasicEntity findCompany(Long id) { + return suppliersEnterpriseBasicDao.findCompany(id); + } + + @Override + public SuppliersEnterpriseBasicEntity findCompanyByName(String companyName) { + return suppliersEnterpriseBasicDao.findCompanyByName(companyName); + } + + @Override + public List getCompany(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest) { + if (suppliersEnterpriseBasicRequest == null) { + return Collections.emptyList(); + } + int offset = (suppliersEnterpriseBasicRequest.getPage() - 1) * suppliersEnterpriseBasicRequest.getLimit(); + PageHelper.offsetPage(offset, suppliersEnterpriseBasicRequest.getLimit()); + List companyEntities = suppliersEnterpriseBasicDao.getCompany(suppliersEnterpriseBasicRequest); + return companyEntities; + } + + @Override + public boolean modifyCompany(SuppliersEnterpriseBasicEntity companyEntity) { + return suppliersEnterpriseBasicDao.modifyCompany(companyEntity); + } + + @Override + public boolean insertCompany(SuppliersEnterpriseBasicEntity companyEntity) { + return suppliersEnterpriseBasicDao.insertCompany(companyEntity); + } + + @Override + public boolean deleteById(String id) { + return suppliersEnterpriseBasicDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersEnterpriseCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersEnterpriseCertServiceImpl.java new file mode 100644 index 0000000..84f4c65 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersEnterpriseCertServiceImpl.java @@ -0,0 +1,75 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.SuppliersEnterpriseBasicCertDao; +import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; +import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; +import com.glxp.sale.admin.service.info.CompanyCertService; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; +import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SuppliersEnterpriseCertServiceImpl implements SuppliersEnterpriseBasicCertService { + + @Resource + SuppliersEnterpriseBasicCertDao suppliersEnterpriseBasicCertDao; + + @Override + public List filterCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest) { + if (filterSuppliersEnterpriseBasicCertRequest == null) { + return Collections.emptyList(); + } + if (filterSuppliersEnterpriseBasicCertRequest.getPage() != null) { + int offset = (filterSuppliersEnterpriseBasicCertRequest.getPage() - 1) * filterSuppliersEnterpriseBasicCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSuppliersEnterpriseBasicCertRequest.getLimit()); + } + return suppliersEnterpriseBasicCertDao.filterCompanyCert(filterSuppliersEnterpriseBasicCertRequest); + } + + @Override + public SupplierEnterpriseBasicCertEntity findCompanyCert(Long enterpriseId) { + return suppliersEnterpriseBasicCertDao.findCompanyCert(enterpriseId); + } + + @Override + public List getCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest) { + if (filterSuppliersEnterpriseBasicCertRequest == null) { + return Collections.emptyList(); + } + int offset = (filterSuppliersEnterpriseBasicCertRequest.getPage() - 1) * filterSuppliersEnterpriseBasicCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSuppliersEnterpriseBasicCertRequest.getLimit()); + List companyEntities = suppliersEnterpriseBasicCertDao.getCompanyCert(filterSuppliersEnterpriseBasicCertRequest); + return companyEntities; + } + + @Override + public SupplierEnterpriseBasicCertEntity findCompanyCertByName(String companyName) { + return suppliersEnterpriseBasicCertDao.findCompanyCertByName(companyName); + } + + @Override + public boolean updateCompanyCert(SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity) { + return suppliersEnterpriseBasicCertDao.updateCompanyCert(supplierEnterpriseBasicCertEntity); + } + + @Override + public boolean insertCompanyCert(SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity) { + return suppliersEnterpriseBasicCertDao.insertCompanyCert(supplierEnterpriseBasicCertEntity); + } + + @Override + public boolean deleteById(String id) { + return suppliersEnterpriseBasicCertDao.deleteById(id); + } + + @Override + public boolean deleteByEnterpriseId(String enterpriseId) { + return suppliersEnterpriseBasicCertDao.deleteByEnterpriseId(enterpriseId); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersRegistrationBasicServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersRegistrationBasicServiceImpl.java new file mode 100644 index 0000000..6e62f52 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/SuppliersRegistrationBasicServiceImpl.java @@ -0,0 +1,61 @@ +package com.glxp.sale.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.SuppliersRegistrationBasicDao; +import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; +import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; +import com.glxp.sale.admin.service.info.SuppliersRegistrationBasicService; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SuppliersRegistrationBasicServiceImpl implements SuppliersRegistrationBasicService { + + @Resource + SuppliersRegistrationBasicDao suppliersRegistrationBasicDao; + + @Override + public SuppliersRegistrationBasicEntity findRegistration(Long id) { + return suppliersRegistrationBasicDao.findRegistration(id); + } + + @Override + public SuppliersRegistrationBasicEntity findRegistrationByName(String recordProductName) { + return suppliersRegistrationBasicDao.findRegistrationByName(recordProductName); + } + + @Override + public List getRegistration(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest) { + if (suppliersRegistrationBasicRequest == null) { + return Collections.emptyList(); + } + int offset = (suppliersRegistrationBasicRequest.getPage() - 1) * suppliersRegistrationBasicRequest.getLimit(); + PageHelper.offsetPage(offset, suppliersRegistrationBasicRequest.getLimit()); + List companyEntities = suppliersRegistrationBasicDao.getRegistration(suppliersRegistrationBasicRequest); + return companyEntities; + } + + @Override + public boolean modifyRegistration(SuppliersRegistrationBasicEntity companyEntity) { + return suppliersRegistrationBasicDao.modifyRegistration(companyEntity); + } + + @Override + public boolean insertRegistration(SuppliersRegistrationBasicEntity companyEntity) { + return suppliersRegistrationBasicDao.insertRegistration(companyEntity); + } + + @Override + public boolean deleteById(String id) { + return suppliersRegistrationBasicDao.deleteById(id); + } + + @Override + public boolean deleteByEnterpriseId(String enterpriseId) { + return suppliersRegistrationBasicDao.deleteByEnterpriseId(enterpriseId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java new file mode 100644 index 0000000..fcb55e7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/SystemParamConfigService.java @@ -0,0 +1,31 @@ +package com.glxp.sale.admin.service.param; + +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.req.param.SystemParamConfigRequest; +import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest; + +import java.util.List; + + +public interface SystemParamConfigService { + + List queryPage(SystemParamConfigRequest SystemParamConfigRequest); + + SystemParamConfigEntity selectSystemParamConfig(); + + SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest SystemParamConfigRequest); + + SystemParamConfigEntity selectByParamName(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamKey(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamKey(String key); + + String selectValueByParamKey(String key); + + boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean insert(SystemParamConfigEntity systemParamConfigEntity); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java new file mode 100644 index 0000000..ccde086 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java @@ -0,0 +1,79 @@ +package com.glxp.sale.admin.service.param.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.param.SystemParamConfigDao; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.req.param.SystemParamConfigRequest; +import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SystemParamConfigServiceImpl implements SystemParamConfigService { + @Resource + SystemParamConfigDao systemParamConfigDao; + + @Override + public List queryPage(SystemParamConfigRequest SystemParamConfigRequest) { + int offset = (SystemParamConfigRequest.getPage() - 1) * SystemParamConfigRequest.getLimit(); + PageHelper.offsetPage(offset, SystemParamConfigRequest.getLimit()); + List list = systemParamConfigDao.queryPage(SystemParamConfigRequest); + return list; + } + + @Override + public SystemParamConfigEntity selectSystemParamConfig() { + SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); + systemParamConfigRequest.setId(1); + return systemParamConfigDao.findSystemParamConfig(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest) { + return systemParamConfigDao.findSystemParamConfig(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity selectByParamName(SystemParamConfigRequest systemParamConfigRequest) { + return systemParamConfigDao.selectByParamName(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity selectByParamKey(SystemParamConfigRequest systemParamConfigRequest) { + return systemParamConfigDao.selectByParamKey(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity selectByParamKey(String key) { + return systemParamConfigDao.selectByParamKey(key); + } + + @Override + public String selectValueByParamKey(String key) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigDao.selectByParamKey(key); + if(systemParamConfigEntity!=null ){ + return systemParamConfigEntity.getParamValue(); + } + return null; + } + + @Override + public boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest) { + + return systemParamConfigDao.updateById(systemParamConfigSaveRequest); + } + + @Override + public boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest) { + + return systemParamConfigDao.updateParentId(systemParamConfigSaveRequest); + } + + @Override + public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { + return systemParamConfigDao.insert(systemParamConfigEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CodesService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CodesService.java new file mode 100644 index 0000000..befa984 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CodesService.java @@ -0,0 +1,43 @@ +package com.glxp.sale.admin.service.sync; + + +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.WarehouseQueryRequest; + +import java.util.List; + +public interface CodesService { + + List listWarehouse(WarehouseQueryRequest warehouseQueryRequest); + + boolean insertWarehouse(WarehouseEntity warehouseEntity); + + boolean insertWarehouses(List warehouseEntities); + + boolean deleteByOrderId(String orderId); + + List findByNo(WarehouseQueryRequest warehouseQueryRequest); + + boolean isExits(WarehouseEntity warehouseEntity); + + List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + + List findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + List findByReceiptId(String orderId); + + List findByCode(String code); + + boolean updateOrderId(String oldOrderId, String newOrderId); + + List searchCode(String code); + + boolean updateUnit(String orderId, String fromCorpId, String fromCorp); + + boolean updateCode(WarehouseEntity warehouseEntity); + + boolean updateRelId(String relId, String nameCode, String orderId); + + boolean updateSupId(String sup, String nameCode, String orderId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CorpImportDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CorpImportDetailService.java new file mode 100644 index 0000000..8164a7d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CorpImportDetailService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.CorpImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface CorpImportDetailService { + + List filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean insertCorpImports(List corpImportDetailEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CorpImportLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CorpImportLogService.java new file mode 100644 index 0000000..54a8496 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/CorpImportLogService.java @@ -0,0 +1,22 @@ +package com.glxp.sale.admin.service.sync; + +import com.glxp.sale.admin.entity.sync.CorpImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CorpImportLogService { + + CorpImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean updateImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/IOOrderStatusService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/IOOrderStatusService.java new file mode 100644 index 0000000..51bfa7e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/IOOrderStatusService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.sync; + + +import com.glxp.sale.admin.entity.sync.IOOrderStatusEntity; +import com.glxp.sale.admin.req.sync.OrderStatusFilterRequest; + +import java.util.List; + +public interface IOOrderStatusService { + + IOOrderStatusEntity findByOrderId(String orderId); + + List filterOrderStatus(OrderStatusFilterRequest warehouseQueryRequest); + + boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity); + + boolean deleteByOrderId(String orderId); + + boolean updateOrderStatus(IOOrderStatusEntity warehouseEntity); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/OrderDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/OrderDetailService.java new file mode 100644 index 0000000..76ed5a1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/OrderDetailService.java @@ -0,0 +1,44 @@ +package com.glxp.sale.admin.service.sync; + + +import com.glxp.sale.admin.entity.sync.ErpOrderEntity; +import com.glxp.sale.admin.req.sync.FilterErpOrderRequest; + +import java.util.List; + +public interface OrderDetailService { + + List filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllByOrderIdFk(String orderId); + + List findByStockCheck(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findAllByDocids(List docids); + + List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest); + + boolean insertErpOrders(List erpOrderEntities); + + boolean insertErpOrder(ErpOrderEntity erpOrderEntity); + + boolean updateErpOrder(ErpOrderEntity erpOrderEntity); + + List selectAllIds(List docids); + + boolean deleteById(String id); + + boolean deleteByPrimiyId(String id); + + boolean deleteByOrderId(String id); + + ErpOrderEntity findById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/OrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/OrderService.java new file mode 100644 index 0000000..3e7c55a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/OrderService.java @@ -0,0 +1,54 @@ +package com.glxp.sale.admin.service.sync; + + +import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.OrderFilterRequest; +import com.glxp.sale.admin.req.sync.OrderQueryRequest; + +import java.util.List; + +public interface OrderService { + + List listOrders(OrderQueryRequest orderQueryRequest); + + boolean insertOrder(OrderEntity orderEntity); + + boolean updateOrder(OrderEntity orderEntity); + + List listOrderError(OrderQueryRequest orderQueryRequest); + + List listOrderRepeat(OrderQueryRequest orderQueryRequest); + + boolean deleteByOrderId(String orderId); + + boolean deleteById(String id); + + boolean updateUnit(OrderEntity orderEntity); + + boolean updateOrderStatus(String orderId, Integer status); + + boolean updateExportStatus(String orderId, Integer exportStatus); + + boolean updateSignStatus(String orderId, String signStatus); + + boolean updateContrastStatus(String orderId, String contrastStatus); + + boolean updateRemark(String orderId, String remark); + + List findAllOrders(OrderFilterRequest orderFilterRequest); + + List filterListOr(OrderFilterRequest orderFilterRequest); + + List filterList(OrderFilterRequest orderFilterRequest); + + OrderEntity findOne(OrderFilterRequest orderFilterRequest); + + OrderEntity findById(String orderId); + + List findCodesById(String orderId); + + List filterListByOrder(List orderList); + + List filterListByCode(List warehouseEntityList); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrImportLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrImportLogService.java new file mode 100644 index 0000000..6f88735 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrImportLogService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.sync; + + +import com.glxp.sale.admin.entity.sync.ThrImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrImportLogService { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrImportLogEntity thrProductsImportLogEntity); + + boolean deleteById(String id); + + ThrImportLogEntity selectByGenKey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrOrderImportDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrOrderImportDetailService.java new file mode 100644 index 0000000..37b0cae --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrOrderImportDetailService.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.ThrOrderImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrOrderImportDetailService { + + List filterOrderImportDetail(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean insertOrderImportDetails(List thrOrderImportDetailEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrOrderImportLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrOrderImportLogService.java new file mode 100644 index 0000000..4dd45d7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrOrderImportLogService.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.ThrOrderImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrOrderImportLogService { + ThrOrderImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrProductsImportDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrProductsImportDetailService.java new file mode 100644 index 0000000..f289015 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrProductsImportDetailService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.ThrProductsImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrProductsImportDetailService { + + List filterProductsDetailImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean insertProductsDetailImports(List thrOrderImportDetailEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrProductsImportLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrProductsImportLogService.java new file mode 100644 index 0000000..4595adf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/ThrProductsImportLogService.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.ThrProductsImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrProductsImportLogService { + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean deleteById(String id); + + ThrProductsImportLogEntity selectByGenKey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/UdiInfoImportDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/UdiInfoImportDetailService.java new file mode 100644 index 0000000..99ae5a5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/UdiInfoImportDetailService.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.UdiInfoImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface UdiInfoImportDetailService { + + + List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + + boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean insertUdiInfoImports(List udiInfoImportEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/UdiInfoImportLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/UdiInfoImportLogService.java new file mode 100644 index 0000000..7289621 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/UdiInfoImportLogService.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.service.sync; + + + +import com.glxp.sale.admin.entity.sync.UdiInfoImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; + +import java.util.List; + +public interface UdiInfoImportLogService { + + + UdiInfoImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CodesServiceImpl.java new file mode 100644 index 0000000..640d6a5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CodesServiceImpl.java @@ -0,0 +1,133 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.CodesDao; +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.WarehouseQueryRequest; +import com.glxp.sale.admin.service.sync.CodesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CodesServiceImpl implements CodesService { + + @Resource + CodesDao codesDao; + + @Override + public List listWarehouse(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + return codesDao.listWarehouse(warehouseQueryRequest); + } + + + @Override + public boolean insertWarehouse(WarehouseEntity warehouseEntity) { + return codesDao.insertWarehouse(warehouseEntity); + } + + @Override + public boolean insertWarehouses(List warehouseEntities) { + return codesDao.insertWarehouses(warehouseEntities); + } + + @Override + public boolean deleteByOrderId(String orderId) { + return codesDao.deleteByOrderId(orderId); + } + + + @Override + public List findByNo(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + return codesDao.findByNo(warehouseQueryRequest); + } + + @Override + public boolean isExits(WarehouseEntity warehouseEntity) { + + int result = codesDao.isExit(warehouseEntity); + if (result == 1) + return true; + else + return false; + } + + @Override + public List findByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + if (warehouseQueryRequest.getPage() != null) { + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + } + + return codesDao.findByOrderId(warehouseQueryRequest); + } + + @Override + public List findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + return codesDao.findByOrderId(warehouseQueryRequest); + } + + @Override + public List findByReceiptId(String orderId) { + return codesDao.findByReceiptId(orderId); + } + + + @Override + public List findByCode(String code) { + + return codesDao.findByCode(code); + } + + @Override + public boolean updateOrderId(String oldOrderId, String newOrderId) { + + + return codesDao.updateOrderId(oldOrderId, newOrderId); + } + + @Override + public List searchCode(String code) { + return codesDao.searchCode(code); + } + + + @Override + public boolean updateUnit(String orderId, String fromCorpId, String fromCorp) { + return codesDao.updateUnit(orderId, fromCorpId, fromCorp); + } + + @Override + public boolean updateCode(WarehouseEntity warehouseEntity) { + return codesDao.updateCode(warehouseEntity); + } + + @Override + public boolean updateRelId(String relId, String nameCode, String orderId) { + return codesDao.updateRelId(relId, nameCode, orderId); + } + + @Override + public boolean updateSupId(String sup, String nameCode, String orderId) { + return codesDao.updateSupId(sup, nameCode, orderId); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CorpImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CorpImportDetailServiceImpl.java new file mode 100644 index 0000000..63f397d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CorpImportDetailServiceImpl.java @@ -0,0 +1,56 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.CorpImportDetailDao; +import com.glxp.sale.admin.entity.sync.CorpImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.CorpImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CorpImportDetailServiceImpl implements CorpImportDetailService { + @Resource + CorpImportDetailDao corpImportDetailDao; + + @Override + public List filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = corpImportDetailDao.filterCorpImport(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity) { + return corpImportDetailDao.insertCorpImport(corpImportDetailEntity); + } + + @Override + public boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity) { + return corpImportDetailDao.updateCorpImport(corpImportDetailEntity); + } + + @Override + public boolean insertCorpImports(List corpImportDetailEntities) { + return corpImportDetailDao.insertCorpImports(corpImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return corpImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return corpImportDetailDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CorpImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CorpImportLogServiceImpl.java new file mode 100644 index 0000000..d779889 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/CorpImportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.CorpImportLogDao; +import com.glxp.sale.admin.entity.sync.CorpImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.CorpImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CorpImportLogServiceImpl implements CorpImportLogService { + + @Resource + CorpImportLogDao corpImportLogDao; + + @Override + public CorpImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = corpImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = corpImportLogDao.filterImportLog(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertImportLog(CorpImportLogEntity corpImportLogEntity) { + return corpImportLogDao.insertImportLog(corpImportLogEntity); + } + + @Override + public boolean updateImportLog(CorpImportLogEntity corpImportLogEntity) { + return corpImportLogDao.updateImportLog(corpImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return corpImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/IOOrderStatusServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/IOOrderStatusServiceImpl.java new file mode 100644 index 0000000..5412399 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/IOOrderStatusServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.IOOrderStatusDao; +import com.glxp.sale.admin.entity.sync.IOOrderStatusEntity; +import com.glxp.sale.admin.req.sync.OrderStatusFilterRequest; +import com.glxp.sale.admin.service.sync.IOOrderStatusService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class IOOrderStatusServiceImpl implements IOOrderStatusService { + + + @Resource + IOOrderStatusDao ioOrderStatusDao; + + + @Override + public IOOrderStatusEntity findByOrderId(String orderId) { + OrderStatusFilterRequest orderStatusFilterRequest = new OrderStatusFilterRequest(); + orderStatusFilterRequest.setOrderId(orderId); + List orderStatusEntities = ioOrderStatusDao.filterOrderStatus(orderStatusFilterRequest); + if (orderStatusEntities != null && orderStatusEntities.size() > 0) { + return orderStatusEntities.get(0); + } + return null; + } + + @Override + public List filterOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) { + if (orderStatusFilterRequest == null) { + return Collections.emptyList(); + } + if (orderStatusFilterRequest.getPage() != null) { + int offset = (orderStatusFilterRequest.getPage() - 1) * orderStatusFilterRequest.getLimit(); + PageHelper.offsetPage(offset, orderStatusFilterRequest.getLimit()); + } + return ioOrderStatusDao.filterOrderStatus(orderStatusFilterRequest); + } + + @Override + public boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity) { + return ioOrderStatusDao.insertOrderStatus(ioOrderStatusEntity); + } + + @Override + public boolean deleteByOrderId(String orderId) { + return ioOrderStatusDao.deleteByOrderId(orderId); + } + + @Override + public boolean updateOrderStatus(IOOrderStatusEntity ioOrderStatusEntity) { + return ioOrderStatusDao.updateOrderStatus(ioOrderStatusEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/OrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/OrderDetailServiceImpl.java new file mode 100644 index 0000000..bbc99fb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/OrderDetailServiceImpl.java @@ -0,0 +1,136 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.OrderDetailDao; +import com.glxp.sale.admin.entity.sync.ErpOrderEntity; +import com.glxp.sale.admin.req.sync.FilterErpOrderRequest; +import com.glxp.sale.admin.service.sync.OrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class OrderDetailServiceImpl implements OrderDetailService { + + @Resource + OrderDetailDao orderDetailDao; + + @Override + public List filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + + return orderDetailDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List filterAllByOrderIdFk(String orderId) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderIdFk(orderId); + return orderDetailDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List findByStockCheck(FilterErpOrderRequest filterErpOrderRequest) { + + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return orderDetailDao.findByStockCheck(filterErpOrderRequest.getOrderIds()); + } + + @Override + public List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + if (filterErpOrderRequest.getPage() != null) { + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + } + return orderDetailDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return orderDetailDao.filterMyErpMainOrder(filterErpOrderRequest); + } + + @Override + public List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + if (filterErpOrderRequest.getPage() != null && filterErpOrderRequest.getLimit() != null) { + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + } + + return orderDetailDao.filterMyErpDetailOrder(filterErpOrderRequest); + } + + @Override + public List findAllByDocids(List docids) { + return orderDetailDao.findAllByDocids(docids); + } + + @Override + public List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest) { + return orderDetailDao.filterAllDocid(filterErpOrderRequest); + } + + @Override + public List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest) { + return orderDetailDao.filterAllDocidE(filterErpOrderRequest); + } + + @Override + public boolean insertErpOrders(List erpOrderEntities) { + return orderDetailDao.insertErpOrders(erpOrderEntities); + } + + @Override + public boolean insertErpOrder(ErpOrderEntity erpOrderEntity) { + return orderDetailDao.insertErpOrder(erpOrderEntity); + } + + @Override + public boolean updateErpOrder(ErpOrderEntity erpOrderEntity) { + return orderDetailDao.updateErpOrder(erpOrderEntity); + } + + @Override + public List selectAllIds(List docids) { + return orderDetailDao.selectAllIds(docids); + } + + @Override + public boolean deleteById(String id) { + return orderDetailDao.deleteById(id); + } + + @Override + public boolean deleteByPrimiyId(String id) { + return orderDetailDao.deleteByPrimiyId(id); + } + + @Override + public boolean deleteByOrderId(String id) { + return orderDetailDao.deleteByOrderId(id); + } + + @Override + public ErpOrderEntity findById(String id) { + return orderDetailDao.findById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/OrderServiceImpl.java new file mode 100644 index 0000000..0cf70b4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/OrderServiceImpl.java @@ -0,0 +1,159 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.OrderDao; +import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.entity.sync.WarehouseEntity; +import com.glxp.sale.admin.req.sync.OrderFilterRequest; +import com.glxp.sale.admin.req.sync.OrderQueryRequest; +import com.glxp.sale.admin.service.sync.OrderService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class OrderServiceImpl implements OrderService { + + @Resource + OrderDao orderDao; + + @Override + public List listOrders(OrderQueryRequest orderQueryRequest) { + if (orderQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (orderQueryRequest.getPage() - 1) * orderQueryRequest.getLimit(); + PageHelper.offsetPage(offset, orderQueryRequest.getLimit()); + return orderDao.listOrder(orderQueryRequest); + } + + + @Override + public boolean insertOrder(OrderEntity orderEntity) { + return orderDao.insertOrder(orderEntity); + } + + @Override + public boolean updateOrder(OrderEntity orderEntity) { + return orderDao.updateOrder(orderEntity); + } + + @Override + public List listOrderError(OrderQueryRequest orderQueryRequest) { + if (orderQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (orderQueryRequest.getPage() - 1) * orderQueryRequest.getLimit(); + PageHelper.offsetPage(offset, orderQueryRequest.getLimit()); + return orderDao.listOrderError(orderQueryRequest); + } + + @Override + public List listOrderRepeat(OrderQueryRequest orderQueryRequest) { + if (orderQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (orderQueryRequest.getPage() - 1) * orderQueryRequest.getLimit(); + PageHelper.offsetPage(offset, orderQueryRequest.getLimit()); + return orderDao.listOrderRepeat(orderQueryRequest); + } + + @Override + public boolean deleteByOrderId(String orderId) { + return orderDao.deleteByOrderId(orderId); + } + + @Override + public boolean deleteById(String id) { + return orderDao.deleteById(id); + } + + @Override + public boolean updateUnit(OrderEntity orderEntity) { + return orderDao.updateUnit(orderEntity); + } + + @Override + public boolean updateOrderStatus(String orderId, Integer status) { + return orderDao.updateOrderStatus(orderId, status); + } + + @Override + public boolean updateExportStatus(String orderId, Integer exportStatus) { + return orderDao.updateExportStatus(orderId, exportStatus); + } + + @Override + public boolean updateSignStatus(String orderId, String signStatus) { + return orderDao.updateSignStatus(orderId, signStatus); + } + + @Override + public boolean updateContrastStatus(String orderId, String contrastStatus) { + return orderDao.updateContrastStatus(orderId, contrastStatus); + } + + @Override + public boolean updateRemark(String orderId, String remark) { + return orderDao.updateRemark(orderId, remark); + } + + @Override + public List findAllOrders(OrderFilterRequest orderFilterRequest) { + return orderDao.filterList(orderFilterRequest); + } + + @Override + public List filterListOr(OrderFilterRequest orderFilterRequest) { + if (orderFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (orderFilterRequest.getPage() - 1) * orderFilterRequest.getLimit(); + PageHelper.offsetPage(offset, orderFilterRequest.getLimit()); + return orderDao.filterListOr(orderFilterRequest); + } + + @Override + public List filterList(OrderFilterRequest orderFilterRequest) { + if (orderFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (orderFilterRequest.getPage() - 1) * orderFilterRequest.getLimit(); + PageHelper.offsetPage(offset, orderFilterRequest.getLimit()); + return orderDao.filterList(orderFilterRequest); + } + + @Override + public OrderEntity findOne(OrderFilterRequest orderFilterRequest) { + return orderDao.findOne(orderFilterRequest); + } + + @Override + public OrderEntity findById(String orderId) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(orderId); + return orderDao.findOne(orderFilterRequest); + } + + @Override + public List findCodesById(String orderId) { + return null;//todo + } + + @Override + public List filterListByOrder(List orderList) { + return orderDao.filterListByOrder(orderList); + } + + @Override + public List filterListByCode(List warehouseEntityList) { + if (warehouseEntityList == null) { + return Collections.emptyList(); + } + return orderDao.filterListByCode(warehouseEntityList); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrImportLogServiceImpl.java new file mode 100644 index 0000000..ac7e294 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrImportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.ThrImportLogDao; +import com.glxp.sale.admin.entity.sync.ThrImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.ThrImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrImportLogServiceImpl implements ThrImportLogService { + + @Resource + ThrImportLogDao thrImportLogDao; + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + } + + @Override + public boolean insertImportLog(ThrImportLogEntity thrImportLogEntity) { + return thrImportLogDao.insertImportLog(thrImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrImportLogEntity thrImportLogEntity) { + return thrImportLogDao.updateImportLog(thrImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrImportLogDao.deleteById(id); + } + + @Override + public ThrImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrOrderImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrOrderImportDetailServiceImpl.java new file mode 100644 index 0000000..a5ee171 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrOrderImportDetailServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.ThrOrderImportDetailDao; +import com.glxp.sale.admin.entity.sync.ThrOrderImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.ThrOrderImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailService { + + @Resource + ThrOrderImportDetailDao thrOrderImportDetailDao; + + @Override + public List filterOrderImportDetail(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = thrOrderImportDetailDao.filterOrderdDetailImport(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { + return thrOrderImportDetailDao.insertOrderdDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { + return thrOrderImportDetailDao.updateOrderdDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean insertOrderImportDetails(List thrOrderImportDetailEntities) { + return thrOrderImportDetailDao.insertOrderdDetailImports(thrOrderImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return thrOrderImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return thrOrderImportDetailDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrOrderImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrOrderImportLogServiceImpl.java new file mode 100644 index 0000000..ac174fc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrOrderImportLogServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.ThrOrderImportLogDao; +import com.glxp.sale.admin.entity.sync.ThrOrderImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.ThrOrderImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + + +@Service +public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { + @Resource + ThrOrderImportLogDao thrOrderImportLogDao; + + @Override + public ThrOrderImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrOrderImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrOrderImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + + } + + @Override + public boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity) { + return thrOrderImportLogDao.insertImportLog(thrOrderImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity) { + return thrOrderImportLogDao.updateImportLog(thrOrderImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrOrderImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrProductsImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrProductsImportDetailServiceImpl.java new file mode 100644 index 0000000..7754c62 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrProductsImportDetailServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.ThrProductsImportDetailDao; +import com.glxp.sale.admin.entity.sync.ThrProductsImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.ThrProductsImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDetailService { + + @Resource + ThrProductsImportDetailDao thrProductsImportDetailDao; + + @Override + public List filterProductsDetailImport(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = thrProductsImportDetailDao.filterProductsDetailImport(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { + return thrProductsImportDetailDao.insertProductsDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { + return thrProductsImportDetailDao.updateProductsDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean insertProductsDetailImports(List thrOrderImportDetailEntities) { + return thrProductsImportDetailDao.insertProductsDetailImports(thrOrderImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return thrProductsImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return thrProductsImportDetailDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrProductsImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrProductsImportLogServiceImpl.java new file mode 100644 index 0000000..b9deba8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/ThrProductsImportLogServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.ThrProductsImportLogDao; +import com.glxp.sale.admin.entity.sync.ThrProductsImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.ThrProductsImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogService { + @Resource + ThrProductsImportLogDao thrProductsImportLogDao; + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrProductsImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + } + + @Override + public boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity) { + return thrProductsImportLogDao.insertImportLog(thrProductsImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity) { + return thrProductsImportLogDao.updateImportLog(thrProductsImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrProductsImportLogDao.deleteById(id); + } + + @Override + public ThrProductsImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrProductsImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/UdiInfoImportDetailServiceImpl.java new file mode 100644 index 0000000..0db4aa9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/UdiInfoImportDetailServiceImpl.java @@ -0,0 +1,60 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.UdiInfoImportDetailDao; +import com.glxp.sale.admin.entity.sync.UdiInfoImportDetailEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.UdiInfoImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailService { + + @Resource + UdiInfoImportDetailDao udiInfoImportDao; + + + @Override + public List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = udiInfoImportDao.filterUdiInfoImport(filterInCodeLogRequest); + return data; + + } + + + @Override + public boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity) { + return udiInfoImportDao.insertUdiInfoImport(udiInfoImportEntity); + } + + @Override + public boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity) { + return udiInfoImportDao.updateUdiInfoImport(udiInfoImportEntity); + } + + @Override + public boolean insertUdiInfoImports(List udiInfoImportEntities) { + return udiInfoImportDao.insertUdiInfoImports(udiInfoImportEntities); + } + + @Override + public boolean deleteById(String id) { + return udiInfoImportDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return udiInfoImportDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/UdiInfoImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/UdiInfoImportLogServiceImpl.java new file mode 100644 index 0000000..16c1ed6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/sync/impl/UdiInfoImportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.service.sync.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.sync.UdiInfoImportLogDao; +import com.glxp.sale.admin.entity.sync.UdiInfoImportLogEntity; +import com.glxp.sale.admin.req.sync.FilterUdiIpLogRequest; +import com.glxp.sale.admin.service.sync.UdiInfoImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoImportLogServiceImpl implements UdiInfoImportLogService { + @Resource + UdiInfoImportLogDao udiInfoImportLogDao; + + @Override + public UdiInfoImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = udiInfoImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = udiInfoImportLogDao.filterImportLog(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity) { + return udiInfoImportLogDao.insertImportLog(udiInfoImportLogEntity); + } + + @Override + public boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity) { + return udiInfoImportLogDao.updateImportLog(udiInfoImportLogEntity); + } + + + @Override + public boolean deleteById(String id) { + return udiInfoImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/DataImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/DataImportService.java new file mode 100644 index 0000000..88a5ab3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/DataImportService.java @@ -0,0 +1,140 @@ +package com.glxp.sale.admin.thread; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.constant.UdiInfoImportStatus; +import com.glxp.sale.admin.entity.sync.ThrProductsImportDetailEntity; +import com.glxp.sale.admin.entity.sync.ThrProductsImportLogEntity; +import com.glxp.sale.admin.entity.sync.UdiInfoImportDetailEntity; +import com.glxp.sale.admin.entity.sync.UdiInfoImportLogEntity; +import com.glxp.sale.admin.http.UHttpClient; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.ErpProductsResponse; +import com.glxp.sale.admin.res.sync.UdiRelevanceResponse; +import com.glxp.sale.admin.service.sync.ThrProductsImportDetailService; +import com.glxp.sale.admin.service.sync.ThrProductsImportLogService; +import com.glxp.sale.admin.service.sync.UdiInfoImportDetailService; +import com.glxp.sale.admin.service.sync.UdiInfoImportLogService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class DataImportService { + + @Resource + ThrProductsImportLogService thrProductsImportLogService; + @Resource + ThrProductsImportDetailService thrProductsImportDetailService; + @Resource + UdiInfoImportLogService udiInfoImportLogService; + @Resource + UdiInfoImportDetailService udiInfoImportService; + + @Value("${SPMS_IP}") + private String spmsUrl; + + // //接收第三方上传或文件导入数据 + @Async + public void insertData(String genKey, List erpProductsResponses, String thirdSys) { + ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + List thrProductsImportDetailEntities; + thrProductsImportDetailEntities = erpProductsResponses.stream().map( + item -> { + ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); + BeanUtils.copyProperties(item, thrProductsImportDetailEntity); + thrProductsImportDetailEntity.setThirdSysFk(thirdSys); + thrProductsImportDetailEntity.setGenKeyFk(genKey); + return thrProductsImportDetailEntity; + } + ).collect(Collectors.toList()); + + if (thrProductsImportDetailEntities != null && thrProductsImportDetailEntities.size() > 0) { + List> splits = CustomUtil.splitList(thrProductsImportDetailEntities, 100); + for (List temps : splits) { + thrProductsImportDetailService.insertProductsDetailImports(temps); + } + } + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); + } else { + thrProductsImportLogEntity.setRemark("未选择产品信息"); + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); + } + } + + @Async + public void downloadSmpUdiInfo(String genKey, String lastUpdateTime) { + + int page = 1; + int limit = 100; + boolean isSuccess = false; + while (true) { + List udiRelevanceResponses = getUdiInfo(page, limit, lastUpdateTime); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + isSuccess = true; + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { + UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); + udiInfoImportEntity.setUdiCode(udiRelevanceResponse.getNameCode()); + BeanUtils.copyProperties(udiRelevanceResponse, udiInfoImportEntity); + udiInfoImportEntity.setUpdateTime(new Date()); + udiInfoImportEntity.setDataType(BasicProcessStatus.DATA_TYPE_SP); + udiInfoImportEntity.setGenKeyFk(genKey); + udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); + } + if (udiRelevanceResponses.size() >= 100) { + page++; + } else { + break; + } + + } else { + break; + } + } + UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); + if (isSuccess) + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + else udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } + + public List getUdiInfo(int page, int limit, String lastUpdateTime) { + + Map paramMap = new HashMap<>(16); + paramMap.put("page", page); + paramMap.put("limit", limit); + paramMap.put("lastUpdateTime", lastUpdateTime); + String response = UHttpClient.mipsGet(spmsUrl + "/udiwms/basic/products/download", paramMap); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + + }); + if (udiDlDeviceResponse != null && udiDlDeviceResponse.getCode() == 20000) { + List udiRelevanceResponses = udiDlDeviceResponse.getData().getList(); + return udiRelevanceResponses; + } + + } catch (Exception e) { + e.printStackTrace(); + return null; + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlSpOrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlSpOrderService.java new file mode 100644 index 0000000..e976136 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlSpOrderService.java @@ -0,0 +1,113 @@ +package com.glxp.sale.admin.thread; + +import com.alibaba.fastjson.JSONObject; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.entity.sync.*; +import com.glxp.sale.admin.http.SpGetHttp; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.sync.DlOrderResponse; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.CodesService; +import com.glxp.sale.admin.service.sync.IOOrderStatusService; +import com.glxp.sale.admin.service.sync.OrderService; +import com.glxp.sale.admin.service.sync.ThrImportLogService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.FileUtils; +import com.glxp.sale.common.res.BaseResponse; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Service +public class DlSpOrderService { + @Resource + SpGetHttp spGetHttp; + @Resource + CodesService codesService; + @Resource + OrderService orderService; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + IOOrderStatusService ioOrderStatusService; + @Value("${file_path}") + private String filePath; + @Value("${back_file_path}") + private String backFilePath; + @Resource + private ThrImportLogService thrImportLogService; + + @Async + public void dlOrdedrs() { + BaseResponse> baseResponse = spGetHttp.getOrderStatus(); + PageSimpleResponse pageSimpleResponse = baseResponse.getData(); + SystemParamConfigEntity folderConfig = systemParamConfigService.selectByParamKey("gen_order_folder"); + SystemParamConfigEntity stausConfig = systemParamConfigService.selectByParamKey("gen_order_status"); + if (pageSimpleResponse != null) { + List ioOrderStatusEntityList = pageSimpleResponse.getList(); + if (ioOrderStatusEntityList != null && ioOrderStatusEntityList.size() > 0) { + for (IOOrderStatusEntity ioOrderStatusEntity : ioOrderStatusEntityList) { + BaseResponse> ordersRes = spGetHttp.getOrders(ioOrderStatusEntity.getOrderId()); + List dlOrderResponses = ordersRes.getData(); + if (dlOrderResponses != null && dlOrderResponses.size() > 0) { + for (DlOrderResponse dlOrderResponse : dlOrderResponses) { + OrderEntity orderEntity = dlOrderResponse.getOrderEntity(); + IOOrderStatusEntity temp = ioOrderStatusService.findByOrderId(orderEntity.getId()); + if (temp == null) {//避免重复操作插入 + if (Integer.parseInt(stausConfig.getParamValue()) == 1) { + IOOrderStatusEntity orderStatusEntity = new IOOrderStatusEntity(); + orderStatusEntity.setOrderId(orderEntity.getId()); + orderStatusEntity.setUpdateTime(new Date()); + orderStatusEntity.setStatus(1); + ioOrderStatusService.insertOrderStatus(orderStatusEntity); + List codes = dlOrderResponse.getCodes(); + orderService.insertOrder(orderEntity); + codesService.insertWarehouses(codes); + } + + if (Integer.parseInt(folderConfig.getParamValue()) == 1) { + String fileName = filePath + "/" + "扫码单据" + orderEntity.getId() + ".json"; + String backFileName = backFilePath + "/" + "扫码单据" + orderEntity.getId() + ".json"; + List postOrders = new ArrayList<>(); + PostOrderRequest postOrderRequest = new PostOrderRequest(); + List warehouseEntityList = dlOrderResponse.getCodes(); + PostOrderRequest.PostOrder postOrder = new PostOrderRequest.PostOrder(); + postOrder.setCodes(warehouseEntityList); + postOrder.setBillType(orderEntity.getAction()); + postOrders.add(postOrder); + postOrderRequest.setPostOrders(postOrders); + String json = JSONObject.toJSON(postOrderRequest).toString(); + FileUtils.makeDirectory(filePath); + FileUtils.makeDirectory(backFilePath); + FileUtils.SaveFileAs(json, fileName); + FileUtils.SaveFileAs(json, backFileName); + ThrImportLogEntity thrImportLogEntity = new ThrImportLogEntity(); + thrImportLogEntity.setGenKey(CustomUtil.getUUId()); + thrImportLogEntity.setImportType(1); + thrImportLogEntity.setUpdateTime(new Date()); + thrImportLogEntity.setFilePath(fileName); + thrImportLogEntity.setBackFilePath(backFileName); + thrImportLogEntity.setOrderId(orderEntity.getId()); + thrImportLogService.insertImportLog(thrImportLogEntity); + } + spGetHttp.postOrder(orderEntity.getId()); + } + + } + } + + } + } + } + + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java new file mode 100644 index 0000000..795e9b4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java @@ -0,0 +1,72 @@ +package com.glxp.sale.admin.thread; + +import com.glxp.sale.admin.dao.info.ScheduledDao; +import com.glxp.sale.admin.entity.info.ScheduledEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; +import com.glxp.sale.admin.http.SpGetHttp; +import com.glxp.sale.admin.req.info.ScheduledRequest; +import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.sync.IOOrderStatusService; +import com.glxp.sale.admin.util.RedisUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.scheduling.annotation.SchedulingConfigurer; +import org.springframework.scheduling.config.ScheduledTaskRegistrar; +import org.springframework.scheduling.support.CronTrigger; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + + +@Component +@EnableScheduling +public class HeartTask implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(HeartTask.class); + @Resource + protected ScheduledDao scheduledDao; + @Resource + RedisUtil redisUtil; + @Resource + SystemParamConfigService systemParamConfigService; + @Resource + DlSpOrderService dlSpOrderService; + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("heartTask"); + ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); + String cron = scheduledEntity.getCron(); + if (cron.isEmpty()) { + logger.error("cron is null"); + } + return new CronTrigger(cron).nextExecutionTime(triggerContext); + }); + } + + + private void process() { + + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_order_status"); + long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000; + long curTime = System.currentTimeMillis(); + //任务一,定时下载供应商平台已完成单据 + Long lastTime = (Long) redisUtil.get("DL_ORDER_STATUS"); + if (lastTime == null) { + redisUtil.set("DL_ORDER_STATUS", System.currentTimeMillis()); + } + if (curTime - lastTime > timeInterval) { + logger.info("每分钟执行一次单据下载"); + redisUtil.set("DL_ORDER_STATUS", curTime); + dlSpOrderService.dlOrdedrs(); + } + + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java new file mode 100644 index 0000000..a0b9d99 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.thread; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.lang.reflect.Method; +import java.util.concurrent.Executor; + +@EnableAsync +@Configuration +public class TaskExecutorConfig implements AsyncConfigurer { + + private static final Logger log = LoggerFactory.getLogger(TaskExecutorConfig.class); + + + @Override + public Executor getAsyncExecutor() { + ThreadPoolTaskExecutor threadPool = new ThreadPoolTaskExecutor(); + threadPool.setCorePoolSize(5);//当前线程数 + threadPool.setMaxPoolSize(10);// 最大线程数 + threadPool.setQueueCapacity(3);//线程池所使用的缓冲队列 + threadPool.setWaitForTasksToCompleteOnShutdown(true);//等待任务在关机时完成--表明等待所有线程执行完 + threadPool.setAwaitTerminationSeconds(60 * 15);// 等待时间 （默认为0，此时立即停止），并没等待xx秒后强制停止 + threadPool.setThreadNamePrefix("MyAsync-");// 线程名称前缀 + threadPool.initialize(); // 初始化 + return threadPool; + } + +// public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { +// +// return new MyAsyncExceptionHandler(); +// } + + /** + * 自定义异常处理类 + * + * @author hry + */ + class MyAsyncExceptionHandler implements AsyncUncaughtExceptionHandler { + + //手动处理捕获的异常 + @Override + public void handleUncaughtException(Throwable throwable, Method method, Object... obj) { + System.out.println("-------------》》》捕获线程异常信息"); + log.info("Exception message - " + throwable.getMessage()); + log.info("Method name - " + method.getName()); + for (Object param : obj) { + log.info("Parameter value - " + param); + } + } + + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java b/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java new file mode 100644 index 0000000..13ef89f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java @@ -0,0 +1,41 @@ +package com.glxp.sale.admin.upload; + +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; + +@RestController +public class ImageController { + + @GetMapping(value = "/udiwms/image/register/file/getImage") + public void getImage(HttpServletResponse response + , @RequestParam String type + , @RequestParam String name) throws IOException { + OutputStream os = null; + try { + // 读取图片 + BufferedImage image = ImageIO.read( + new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name))); + response.setContentType("image/png"); + os = response.getOutputStream(); + + if (image != null) { + ImageIO.write(image, "png", os); + } + } catch (IOException e) { + + } finally { + if (os != null) { + os.flush(); + os.close(); + } + } + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java new file mode 100644 index 0000000..a4c774c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java @@ -0,0 +1,100 @@ +package com.glxp.sale.admin.upload; + +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * 上传文件控制器 + */ +@RestController +public class uploadController { + /** + * 上传PDF模板 + */ + @PostMapping("/udiwms/upload/pdf/template") + public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException { + if (file.isEmpty()) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空"); + } + + // 保存文件 --------------------- + String fileName = file.getOriginalFilename(); + String fileType = fileName.substring(fileName.lastIndexOf(".")); + // 文件类型判断 + if (StringUtils.isBlank(fileType) || !fileType.equals(".pdf")) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 pdf 格式"); + } + String newName = UUID.randomUUID()+fileType;//生成新文件名 + String savePath = "d:/1s/udiwms/pdf/template"; + + File file1 = new File(savePath); + if(!file1.exists()){// 判断目录是否存在 + file1.mkdirs();// 创建多层目录 + } + file1 = new File(savePath + "/" + newName) ; + try { + file.transferTo(file1); + Map rMap = new HashMap<>(); + rMap.put("msg", "上传成功"); + rMap.put("path", savePath + "/" + newName); + return ResultVOUtils.success(rMap); + } catch (IOException e) { + e.printStackTrace(); + } + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败"); + } + + /** + * 注册页面上传文件 + */ + @PostMapping("/udiwms/upload/register/file") + public BaseResponse uploadRegisterFile(@RequestParam("file") MultipartFile file, + @RequestParam("type") String type) throws UnsupportedEncodingException { + if (file.isEmpty()) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空"); + } + if (StringUtils.isBlank(type)) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件类型不能为空"); + } + + // 保存文件 --------------------- + String fileName = file.getOriginalFilename(); + String fileType = fileName.substring(fileName.lastIndexOf(".")); + // 文件类型判断 + if (StringUtils.isBlank(fileType) || !fileType.equals(".jpg") && !fileType.equals(".png")) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 .jpg,.png 格式"); + } + String newName = UUID.randomUUID()+fileType;//生成新文件名 + String savePath = "d:/1s/udiwms/register/file/" + type; + + File file1 = new File(savePath); + if(!file1.exists()){// 判断目录是否存在 + file1.mkdirs();// 创建多层目录 + } + file1 = new File(savePath + "/" + newName) ; + try { + file.transferTo(file1); + Map rMap = new HashMap<>(); + rMap.put("msg", "上传成功"); + rMap.put("name", newName); + rMap.put("type", type); + return ResultVOUtils.success(rMap); + } catch (IOException e) { + e.printStackTrace(); + } + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败"); + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/CacheUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/CacheUtils.java new file mode 100644 index 0000000..5cbdcc6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/CacheUtils.java @@ -0,0 +1,129 @@ +package com.glxp.sale.admin.util; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; + +import java.util.Collection; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * 缓存操作类 + */ +//@Component +public class CacheUtils { + @Autowired + private RedisTemplate redisTemplate; + + // 维护一个本类的静态变量 + private static CacheUtils cacheUtils; + +// @PostConstruct + public void init() { + cacheUtils = this; + cacheUtils.redisTemplate = this.redisTemplate; + } + + /** + * 将参数中的字符串值设置为键的值，不设置过期时间 + * @param key + * @param value 必须要实现 Serializable 接口 + */ + public static void set(String key, String value) { + cacheUtils.redisTemplate.opsForValue().set(key, value); + } + + /** + * 将参数中的字符串值设置为键的值，设置过期时间 + * @param key + * @param value 必须要实现 Serializable 接口 + * @param timeout + */ + public static void set(String key, String value, Long timeout) { + cacheUtils.redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS); + } + + /** + * 获取与指定键相关的值 + * @param key + * @return + */ + public static Object get(String key) { + return cacheUtils.redisTemplate.opsForValue().get(key); + } + + /** + * 设置某个键的过期时间 + * @param key 键值 + * @param ttl 过期秒数 + */ + public static boolean expire(String key, Long ttl) { + return cacheUtils.redisTemplate.expire(key, ttl, TimeUnit.SECONDS); + } + + /** + * 判断某个键是否存在 + * @param key 键值 + */ + public static boolean hasKey(String key) { + return cacheUtils.redisTemplate.hasKey(key); + } + + /** + * 向集合添加元素 + * @param key + * @param value + * @return 返回值为设置成功的value数 + */ + public static Long sAdd(String key, String... value) { + return cacheUtils.redisTemplate.opsForSet().add(key, value); + } + + /** + * 获取集合中的某个元素 + * @param key + * @return 返回值为redis中键值为key的value的Set集合 + */ + public static Set sGetMembers(String key) { + return cacheUtils.redisTemplate.opsForSet().members(key); + } + + /** + * 将给定分数的指定成员添加到键中存储的排序集合中 + * @param key + * @param value + * @param score + * @return + */ + public static Boolean zAdd(String key, String value, double score) { + return cacheUtils.redisTemplate.opsForZSet().add(key, value, score); + } + + /** + * 返回指定排序集中给定成员的分数 + * @param key + * @param value + * @return + */ + public static Double zScore(String key, String value) { + return cacheUtils.redisTemplate.opsForZSet().score(key, value); + } + + /** + * 删除指定的键 + * @param key + * @return + */ + public static Boolean delete(String key) { + return cacheUtils.redisTemplate.delete(key); + } + + /** + * 删除多个键 + * @param keys + * @return + */ + public static Long delete(Collection keys) { + return cacheUtils.redisTemplate.delete(keys); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/CheckUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/CheckUtils.java new file mode 100644 index 0000000..671b1a6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/CheckUtils.java @@ -0,0 +1,34 @@ +package com.glxp.sale.admin.util; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class CheckUtils { + + + public static Boolean checkCode(List list) { + + Set set = new HashSet(list); + boolean result = list.size() == set.size() ? true : false; + + return result; + } + + + public static String getRepeatIdCard(List list) { + StringBuffer buffer = new StringBuffer(); + buffer.append("重复值是:"); + String temp = ""; + for (int i = 0; i < list.size() - 1; i++) { + temp = list.get(i); + for (int j = i + 1; j < list.size(); j++) { + if (temp.equals(list.get(j))) { + System.out.println("第" + (i + 1) + "个跟第" + (j + 1) + "个重复，值是：" + temp); + buffer.append(temp + ","); + } + } + } + return buffer.toString(); + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java new file mode 100644 index 0000000..11b6f43 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.util; + +public class Constant { + + public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS"; + public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; + public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; + public static final String dlThrCorps = "THR_DOWNLOAD_CORPS"; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java new file mode 100644 index 0000000..cf4e180 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java @@ -0,0 +1,38 @@ +package com.glxp.sale.admin.util; + +import java.util.*; + +public class CustomUtil { + + public static String getUUId() { + UUID uuid = UUID.randomUUID(); + return uuid.toString().replace("-", ""); + } + + //随机生成ID + public static String getId(){ + String id = System.currentTimeMillis()+""; + int number=new Random().nextInt(90)+10; + id = id+number; + return id.substring(4); + } + + public static List> splitList(List list, int len) { + + if (list == null || list.isEmpty() || len < 1) { + return Collections.emptyList(); + } + + List> result = new ArrayList<>(); + + int size = list.size(); + int count = (size + len - 1) / len; + + for (int i = 0; i < count; i++) { + List subList = list.subList(i * len, ((i + 1) * len > size ? size : len * (i + 1))); + result.add(subList); + } + + return result; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java new file mode 100644 index 0000000..af3cafe --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java @@ -0,0 +1,494 @@ +package com.glxp.sale.admin.util; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.FastDateFormat; + +import java.lang.management.ManagementFactory; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +public class DateUtil extends org.apache.commons.lang3.time.DateUtils { + + private static String[] parsePatterns = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM", + "yyyy年MM月dd日", "yyyy年MM月dd日 HH时mm分ss秒", "yyyy年MM月dd日 HH时mm分", "yyyy年MM月dd日 HH时", "yyyy年MM月", + "yyyy"}; + + /** + * 得到日期字符串 ，转换格式（yyyy-MM-dd） + */ + public static String formatDate(Date date) { + return formatDate(date, "yyyy-MM-dd"); + } + + /** + * 得到日期字符串 默认格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + */ + public static String formatDate(long dateTime, String pattern) { + return formatDate(new Date(dateTime), pattern); + } + + /** + * 得到日期字符串 默认格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + */ + public static String formatDate(Date date, String pattern) { + String formatDate = null; + if (date != null) { +// if (StringUtils.isNotBlank(pattern)) { +// formatDate = DateFormatUtils.format(date, pattern); +// } else { +// formatDate = DateFormatUtils.format(date, "yyyy-MM-dd"); +// } + if (StringUtils.isBlank(pattern)) { + pattern = "yyyy-MM-dd"; + } + formatDate = FastDateFormat.getInstance(pattern).format(date); + } + return formatDate; + } + + /** + * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss） + */ + public static String formatDateTime(Date date) { + Date currentTime = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateString = formatter.format(currentTime); + return dateString; + } + + /** + * 得到当前日期字符串 格式（yyyy-MM-dd） + */ + public static String getDate() { + return getDate("yyyy-MM-dd"); + } + + /** + * 得到当前日期字符串 格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + */ + public static String getDate(String pattern) { +// return DateFormatUtils.format(new Date(), pattern); + return FastDateFormat.getInstance(pattern).format(new Date()); + } + + /** + * 得到当前日期前后多少天，月，年的日期字符串 + * + * @param pattern 格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + * @param amont 数量，前为负数，后为正数 + * @param type 类型，可参考Calendar的常量(如：Calendar.HOUR、Calendar.MINUTE、Calendar.SECOND) + * @return + */ + public static String getDate(String pattern, int amont, int type) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(type, amont); +// return DateFormatUtils.format(calendar.getTime(), pattern); + return FastDateFormat.getInstance(pattern).format(calendar.getTime()); + } + + /** + * 得到当前时间字符串 格式（HH:mm:ss） + */ + public static String getTime() { + return formatDate(new Date(), "HH:mm:ss"); + } + + /** + * 得到当前日期和时间字符串 格式（yyyy-MM-dd HH:mm:ss） + */ + public static String getDateTime() { + return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + + /** + * 得到当前年份字符串 格式（yyyy） + */ + public static String getYear() { + return formatDate(new Date(), "yyyy"); + } + + /** + * 得到当前月份字符串 格式（MM） + */ + public static String getMonth() { + return formatDate(new Date(), "MM"); + } + + /** + * 得到当天字符串 格式（dd） + */ + public static String getDay() { + return formatDate(new Date(), "dd"); + } + + /** + * 得到当前星期字符串 格式（E）星期几 + */ + public static String getWeek() { + return formatDate(new Date(), "E"); + } + + /** + * 日期型字符串转化为日期 格式 see to DateUtils#parsePatterns + */ + public static Date parseDate(Object str) { + if (str == null) { + return null; + } + try { + return parseDate(str.toString(), parsePatterns); + } catch (ParseException e) { + return null; + } + } + + + /** + * 获取过去的天数 + * + * @param date + * @return + */ + public static long pastDays(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (24 * 60 * 60 * 1000); + } + + + /** + * 获取过去的小时 + * + * @param date + * @return + */ + public static long pastHour(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (60 * 60 * 1000); + } + + /** + * 获取过去的分钟 + * + * @param date + * @return + */ + public static long pastMinutes(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (60 * 1000); + } + + /** + * 获取过去的秒 + * + * @param date + * @return + */ + public static long pastSecnod(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (1000); + } + + /** + * 获取两个日期之间的天数 + * + * @param before + * @param after + * @return + */ + public static double getDistanceOfTwoDate(Date before, Date after) { + long beforeTime = before.getTime(); + long afterTime = after.getTime(); + return (afterTime - beforeTime) / (1000 * 60 * 60 * 24); + } + + /** + * 获取某月有几天 + * + * @param date 日期 + * @return 天数 + */ + public static int getMonthHasDays(Date date) { +// String yyyyMM = new SimpleDateFormat("yyyyMM").format(date); + String yyyyMM = FastDateFormat.getInstance("yyyyMM").format(date); + String year = yyyyMM.substring(0, 4); + String month = yyyyMM.substring(4, 6); + String day31 = ",01,03,05,07,08,10,12,"; + String day30 = "04,06,09,11"; + int day = 0; + if (day31.contains(month)) { + day = 31; + } else if (day30.contains(month)) { + day = 30; + } else { + int y = Integer.parseInt(year); + if ((y % 4 == 0 && (y % 100 != 0)) || y % 400 == 0) { + day = 29; + } else { + day = 28; + } + } + return day; + } + + /** + * 获取日期是当年的第几周 + * + * @param date + * @return + */ + public static int getWeekOfYear(Date date) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + return cal.get(Calendar.WEEK_OF_YEAR); + } + + /** + * 获取一天的开始时间（如：2015-11-3 00:00:00.000） + * + * @param date 日期 + * @return + */ + public static Date getOfDayFirst(Date date) { + if (date == null) { + return null; + } + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + return calendar.getTime(); + } + + /** + * 获取一天的最后时间（如：2015-11-3 23:59:59.999） + * + * @param date 日期 + * @return + */ + public static Date getOfDayLast(Date date) { + if (date == null) { + return null; + } + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.HOUR, 23); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); + calendar.set(Calendar.MILLISECOND, 999); + return calendar.getTime(); + } + + /** + * 获取服务器启动时间 + * + * @param + * @return + */ + public static Date getServerStartDate() { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + + /** + * 解析日期范围字符串为日期对象 + * + * @param dateString 2018-01-01 ~ 2018-01-31 + * @return new Date[]{2018-01-01, 2018-01-31} + */ + public static Date[] parseDateBetweenString(String dateString) { + Date beginDate = null; + Date endDate = null; + if (StringUtils.isNotBlank(dateString)) { + String[] ss = StringUtils.split(dateString, "~"); + if (ss != null && ss.length == 2) { + String begin = StringUtils.trim(ss[0]); + String end = StringUtils.trim(ss[1]); + if (StringUtils.isNoneBlank(begin, end)) { + try { + beginDate = DateUtils.parseDate(begin); + endDate = DateUtils.parseDate(end); + } catch (ParseException e) { + e.printStackTrace(); + } + + } + } + } + return new Date[]{beginDate, endDate}; + } + + public static final int SECONDS_IN_DAY = 60 * 60 * 24; + public static final long MILLIS_IN_DAY = 1000L * SECONDS_IN_DAY; + + public static boolean isSameDayOfMillis(final long ms1, final long ms2) { + final long interval = ms1 - ms2; + return interval < MILLIS_IN_DAY + && interval > -1L * MILLIS_IN_DAY + && toDay(ms1) == toDay(ms2); + } + + private static long toDay(long millis) { + return (millis + TimeZone.getDefault().getOffset(millis)) / MILLIS_IN_DAY; + } + + /** + * 给时间加上几个小时 + * + * @param date 时间 + * @param hour 需要加的时间 + * @return + */ + public static String addDateMinut(Date date, int hour) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.HOUR, hour);// 24小时制 + date = cal.getTime(); + cal = null; + return format.format(date); + } + + /** + * 给时间加上几个小时 + * + * @param date 时间 + * @param hour 需要加的时间 + * @return DATE + */ + public static Date addDate(Date date, int hour) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.HOUR, hour);// 24小时制 + date = cal.getTime(); + cal = null; + return date; + } + + /** + * 日期比较 + * + * @param date1 日期参数1 + * @param date2 日期参数2 + * @return 1 date1>date2;-1 date1 dt2.getTime()) { + return 1; + } else if (dt1.getTime() < dt2.getTime()) { + return -1; + } else { + return 0; + } + } catch (Exception exception) { + exception.printStackTrace(); + } + return 0; + } + + /** + * 获取昨天开始时间和结束时间 + * + * @return + */ + public static Map getYesterdayRange() { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition = new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.HOUR_OF_DAY, 0); + condition.put("endDate", df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY, -24); + condition.put("startDate", df.format(calendar.getTime())); + return condition; + } + + /** + * 获得近一周的开始时间和结束时间 + * + * @return + */ + public static Map getDaySevenRange() { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition = new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY, 24); + condition.put("endDate", df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY, -168); + condition.put("startDate", df.format(calendar.getTime())); + return condition; + } + + /** + * 获得近一月的开始时间和结束时间 + * + * @return + */ + public static Map getDayTRange() { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition = new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY, 24); + condition.put("endDate", df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY, -720); + condition.put("startDate", df.format(calendar.getTime())); + return condition; + } + + /** + * 获得近一年的开始时间和结束时间 + * + * @return + */ + public static Map getYearTRange() { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition = new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY, 24); + condition.put("endDate", df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY, -8640); + condition.put("startDate", df.format(calendar.getTime())); + return condition; + } + + + public static Map getDayRange(int day) { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition = new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY, 24); + condition.put("endDate", df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY, -(24 * day)); + condition.put("startDate", df.format(calendar.getTime())); + return condition; + } + + public static long timeToStamp(String mydate) throws Exception { + final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + final Date datetime = sdf.parse(mydate);//将你的日期转换为时间戳 + final long time = datetime.getTime(); + System.out.println(mydate + "转换后是：" + time); + return time; + + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/ExcelUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/ExcelUtil.java new file mode 100644 index 0000000..379cd39 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/ExcelUtil.java @@ -0,0 +1,64 @@ +package com.glxp.sale.admin.util; + +import org.apache.poi.hssf.usermodel.*; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +public class ExcelUtil { + + + public void exportExcel( + List> excelData, + String sheetName, + String fileName, + int columnWidth) { + + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet sheet = workbook.createSheet(sheetName); + sheet.setDefaultColumnWidth(columnWidth); + int rowIndex = 0; + for (List data : excelData) { + HSSFRow row = sheet.createRow(rowIndex++); + for (int i = 0; i < data.size(); i++) { + HSSFCell cell = row.createCell(i); + String content = data.get(i); + if (content != null) { + HSSFRichTextString text = new HSSFRichTextString(content); + cell.setCellValue(text); + }else { + + } + } + } + FileOutputStream outputStream = null; + try { + + File createFile = new File(fileName); + if (!createFile.exists()) { + createFile.mkdirs(); + } + outputStream = new FileOutputStream(fileName); + workbook.write(outputStream); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (outputStream != null) { + outputStream.flush(); + outputStream.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + try { + if (workbook != null) { + workbook.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/FastJsonUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/FastJsonUtils.java new file mode 100644 index 0000000..9d3197a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/FastJsonUtils.java @@ -0,0 +1,55 @@ +package com.glxp.sale.admin.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; + +import java.util.List; +import java.util.Map; + +/** + * @author 彭于晏 + * @date 2020/8/11. + */ +public class FastJsonUtils { + + + /** + * 功能描述：把JSON数据转换成指定的java对象 + * @param jsonData JSON数据 + * @param clazz 指定的java对象 + * @return 指定的java对象 + */ + public static T getJsonToBean(String jsonData, Class clazz) { + return JSON.parseObject(jsonData, clazz); + } + + /** + * 功能描述：把java对象转换成JSON数据 + * @param object java对象 + * @return JSON数据 + */ + public static String getBeanToJson(Object object) { + return JSON.toJSONString(object); + } + + /** + * 功能描述：把JSON数据转换成指定的java对象列表 + * @param jsonData JSON数据 + * @param clazz 指定的java对象 + * @return List + */ + public static List getJsonToList(String jsonData, Class clazz) { + return JSON.parseArray(jsonData, clazz); + } + + /** + * 功能描述：把JSON数据转换成较为复杂的List> + * @param jsonData JSON数据 + * @return List> + */ + public static List> getJsonToListMap(String jsonData) { + return JSON.parseObject(jsonData, new TypeReference>>() { + }); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java new file mode 100644 index 0000000..fecfb33 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/FileUtils.java @@ -0,0 +1,953 @@ +package com.glxp.sale.admin.util; + +import java.io.*; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +public class FileUtils { + + public void writeFile(String filePath, String content) { + try { +// fileExits(filePath); + Path path = Paths.get(filePath); + // 使用newBufferedWriter创建文件并写文件 + // 这里使用了try-with-resources方法来关闭流，不用手动关闭 + BufferedWriter writer = + Files.newBufferedWriter(path, StandardCharsets.UTF_8); + writer.write(content); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + public void fileExits(String filePath) throws IOException { + File file = new File(filePath); + if (!file.exists()) { + file.createNewFile(); + } + } + + /** + * 读取 InputStream 到 String字符串中 + */ + public static String readStream(InputStream in) { + try { + //<1>创建字节数组输出流，用来输出读取到的内容 + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + //<2>创建缓存大小 + byte[] buffer = new byte[1024]; // 1KB + //每次读取到内容的长度 + int len = -1; + //<3>开始读取输入流中的内容 + while ((len = in.read(buffer)) != -1) { //当等于-1说明没有数据可以读取了 + baos.write(buffer, 0, len); //把读取到的内容写到输出流中 + } + //<4> 把字节数组转换为字符串 + String content = baos.toString(); + //<5>关闭输入流和输出流 + in.close(); + baos.close(); + //<6>返回字符串结果 + return content; + } catch (Exception e) { + e.printStackTrace(); + return e.getMessage(); + } + } + + /** + * 私有构造方法，防止类的实例化，因为工具类不需要实例化。 + */ + private FileUtils() { + + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param file 需要修改最后访问时间的文件。 + * @since 1.0 + */ + public static void touch(File file) { + long currentTime = System.currentTimeMillis(); + if (!file.exists()) { + System.err.println("file not found:" + file.getName()); + System.err.println("Create a new file:" + file.getName()); + try { + if (file.createNewFile()) { + System.out.println("Succeeded!"); + } else { + System.err.println("Create file failed!"); + } + } catch (IOException e) { + System.err.println("Create file failed!"); + e.printStackTrace(); + } + } + boolean result = file.setLastModified(currentTime); + if (!result) { + System.err.println("touch failed: " + file.getName()); + } + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param fileName 需要修改最后访问时间的文件的文件名。 + * @since 1.0 + */ + public static void touch(String fileName) { + File file = new File(fileName); + touch(file); + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param files 需要修改最后访问时间的文件数组。 + * @since 1.0 + */ + public static void touch(File[] files) { + for (int i = 0; i < files.length; i++) { + touch(files[i]); + } + } + + /** + * 修改文件的最后访问时间。 + * 如果文件不存在则创建该文件。 + * 目前这个方法的行为方式还不稳定，主要是方法有些信息输出，这些信息输出是否保留还在考虑中。 + * + * @param fileNames 需要修改最后访问时间的文件名数组。 + * @since 1.0 + */ + public static void touch(String[] fileNames) { + File[] files = new File[fileNames.length]; + for (int i = 0; i < fileNames.length; i++) { + files[i] = new File(fileNames[i]); + } + touch(files); + } + + /** + * 判断指定的文件是否存在。 + * + * @param fileName 要判断的文件的文件名 + * @return 存在时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean isFileExist(String fileName) { + return new File(fileName).isFile(); + } + + /** + * 创建指定的目录。 + * 如果指定的目录的父目录不存在则创建其目录书上所有需要的父目录。 + * 注意：可能会在返回false的时候创建部分父目录。 + * + * @param file 要创建的目录 + * @return 完全创建成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean makeDirectory(File file) { + if (!file.exists()) { + return file.mkdirs(); + } + return false; + } + + /** + * 创建指定的目录。 + * 如果指定的目录的父目录不存在则创建其目录书上所有需要的父目录。 + * 注意：可能会在返回false的时候创建部分父目录。 + * + * @param fileName 要创建的目录的目录名 + * @return 完全创建成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean makeDirectory(String fileName) { + File file = new File(fileName); + return makeDirectory(file); + } + + + + /** + * 清空指定目录中的文件。 + * 这个方法将尽可能删除所有的文件，但是只要有一个文件没有被删除都会返回false。 + * 另外这个方法不会迭代删除，即不会删除子目录及其内容。 + * + * @param directory 要清空的目录 + * @return 目录下的所有文件都被成功删除时返回true，否则返回false. + * @since 1.0 + */ + public static boolean emptyDirectory(File directory) { + boolean result = true; + File[] entries = directory.listFiles(); + for (int i = 0; i < entries.length; i++) { + if (!entries[i].delete()) { + result = false; + } + } + return result; + } + + /** + * 清空指定目录中的文件。 + * 这个方法将尽可能删除所有的文件，但是只要有一个文件没有被删除都会返回false。 + * 另外这个方法不会迭代删除，即不会删除子目录及其内容。 + * + * @param directoryName 要清空的目录的目录名 + * @return 目录下的所有文件都被成功删除时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean emptyDirectory(String directoryName) { + File dir = new File(directoryName); + return emptyDirectory(dir); + } + + /** + * 删除指定目录及其中的所有内容。 + * + * @param dirName 要删除的目录的目录名 + * @return 删除成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean deleteDirectory(String dirName) { + return deleteDirectory(new File(dirName)); + } + + /** + * 删除指定目录及其中的所有内容。 + * + * @param dir 要删除的目录 + * @return 删除成功时返回true，否则返回false。 + * @since 1.0 + */ + public static boolean deleteDirectory(File dir) { + if ((dir == null) || !dir.isDirectory()) { + throw new IllegalArgumentException("Argument " + dir + + " is not a directory. "); + } + + File[] entries = dir.listFiles(); + int sz = entries.length; + + for (int i = 0; i < sz; i++) { + if (entries[i].isDirectory()) { + if (!deleteDirectory(entries[i])) { + return false; + } + } else { + if (!entries[i].delete()) { + return false; + } + } + } + + if (!dir.delete()) { + return false; + } + return true; + } + + /** + * 列出目录中的所有内容，包括其子目录中的内容。 + * + * @param file 要列出的目录 + * @param filter 过滤器 + * @return 目录内容的文件数组。 + * @since 1.0 + */ + public static File[] listAll(File file, + javax.swing.filechooser.FileFilter filter) { + ArrayList list = new ArrayList(); + File[] files; + if (!file.exists() || file.isFile()) { + return null; + } + list(list, file, filter); + files = new File[list.size()]; + list.toArray(files); + return files; + } + + /** + * 将目录中的内容添加到列表。 + * + * @param list 文件列表 + * @param filter 过滤器 + * @param file 目录 + */ + private static void list(ArrayList list, File file, + javax.swing.filechooser.FileFilter filter) { + if (filter.accept(file)) { + list.add(file); + if (file.isFile()) { + return; + } + } + if (file.isDirectory()) { + File files[] = file.listFiles(); + for (int i = 0; i < files.length; i++) { + list(list, files[i], filter); + } + } + + } + + /** + * 返回文件的URL地址。 + * + * @param file 文件 + * @return 文件对应的的URL地址 + * @throws MalformedURLException + * @since 1.0 + * @deprecated 在实现的时候没有注意到File类本身带一个toURL方法将文件路径转换为URL。 + * 请使用File.toURL方法。 + */ + public static URL getURL(File file) throws MalformedURLException { + String fileURL = "file:/" + file.getAbsolutePath(); + URL url = new URL(fileURL); + return url; + } + + /** + * 从文件路径得到文件名。 + * + * @param filePath 文件的路径，可以是相对路径也可以是绝对路径 + * @return 对应的文件名 + * @since 1.0 + */ + public static String getFileName(String filePath) { + File file = new File(filePath); + return file.getName(); + } + + /** + * 从文件名得到文件绝对路径。 + * + * @param fileName 文件名 + * @return 对应的文件路径 + * @since 1.0 + */ + public static String getFilePath(String fileName) { + File file = new File(fileName); + return file.getAbsolutePath(); + } + + /** + * 将DOS/Windows格式的路径转换为UNIX/Linux格式的路径。 + * 其实就是将路径中的"\"全部换为"/"，因为在某些情况下我们转换为这种方式比较方便， + * 某中程度上说"/"比"\"更适合作为路径分隔符，而且DOS/Windows也将它当作路径分隔符。 + * + * @param filePath 转换前的路径 + * @return 转换后的路径 + * @since 1.0 + */ + public static String toUNIXpath(String filePath) { + return filePath.replace('\\', '/'); + } + + /** + * 从文件名得到UNIX风格的文件绝对路径。 + * + * @param fileName 文件名 + * @return 对应的UNIX风格的文件路径 + * @see #toUNIXpath(String filePath) toUNIXpath + * @since 1.0 + */ + public static String getUNIXfilePath(String fileName) { + File file = new File(fileName); + return toUNIXpath(file.getAbsolutePath()); + } + + /** + * 得到文件的类型。 + * 实际上就是得到文件名中最后一个“.”后面的部分。 + * + * @param fileName 文件名 + * @return 文件名中的类型部分 + * @since 1.0 + */ + public static String getTypePart(String fileName) { + int point = fileName.lastIndexOf('.'); + int length = fileName.length(); + if (point == -1 || point == length - 1) { + return ""; + } else { + return fileName.substring(point + 1, length); + } + } + + /** + * 得到文件的类型。 + * 实际上就是得到文件名中最后一个“.”后面的部分。 + * + * @param file 文件 + * @return 文件名中的类型部分 + * @since 1.0 + */ + public static String getFileType(File file) { + return getTypePart(file.getName()); + } + + /** + * 得到文件的名字部分。 + * 实际上就是路径中的最后一个路径分隔符后的部分。 + * + * @param fileName 文件名 + * @return 文件名中的名字部分 + * @since 1.0 + */ + public static String getNamePart(String fileName) { + int point = getPathLsatIndex(fileName); + int length = fileName.length(); + if (point == -1) { + return fileName; + } else if (point == length - 1) { + int secondPoint = getPathLsatIndex(fileName, point - 1); + if (secondPoint == -1) { + if (length == 1) { + return fileName; + } else { + return fileName.substring(0, point); + } + } else { + return fileName.substring(secondPoint + 1, point); + } + } else { + return fileName.substring(point + 1); + } + } + + /** + * 得到文件名中的父路径部分。 + * 对两种路径分隔符都有效。 + * 不存在时返回""。 + * 如果文件名是以路径分隔符结尾的则不考虑该分隔符，例如"/path/"返回""。 + * + * @param fileName 文件名 + * @return 父路径，不存在或者已经是父目录时返回"" + * @since 1.0 + */ + public static String getPathPart(String fileName) { + int point = getPathLsatIndex(fileName); + int length = fileName.length(); + if (point == -1) { + return ""; + } else if (point == length - 1) { + int secondPoint = getPathLsatIndex(fileName, point - 1); + if (secondPoint == -1) { + return ""; + } else { + return fileName.substring(0, secondPoint); + } + } else { + return fileName.substring(0, point); + } + } + + /** + * 得到路径分隔符在文件路径中首次出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @return 路径分隔符在路径中首次出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathIndex(String fileName) { + int point = fileName.indexOf('/'); + if (point == -1) { + point = fileName.indexOf('\\'); + } + return point; + } + + /** + * 得到路径分隔符在文件路径中指定位置后首次出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @param fromIndex 开始查找的位置 + * @return 路径分隔符在路径中指定位置后首次出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathIndex(String fileName, int fromIndex) { + int point = fileName.indexOf('/', fromIndex); + if (point == -1) { + point = fileName.indexOf('\\', fromIndex); + } + return point; + } + + /** + * 得到路径分隔符在文件路径中最后出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @return 路径分隔符在路径中最后出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathLsatIndex(String fileName) { + int point = fileName.lastIndexOf('/'); + if (point == -1) { + point = fileName.lastIndexOf('\\'); + } + return point; + } + + /** + * 得到路径分隔符在文件路径中指定位置前最后出现的位置。 + * 对于DOS或者UNIX风格的分隔符都可以。 + * + * @param fileName 文件路径 + * @param fromIndex 开始查找的位置 + * @return 路径分隔符在路径中指定位置前最后出现的位置，没有出现时返回-1。 + * @since 1.0 + */ + public static int getPathLsatIndex(String fileName, int fromIndex) { + int point = fileName.lastIndexOf('/', fromIndex); + if (point == -1) { + point = fileName.lastIndexOf('\\', fromIndex); + } + return point; + } + + /** + * 将文件名中的类型部分去掉。 + * + * @param filename 文件名 + * @return 去掉类型部分的结果 + * @since 1.0 + */ + public static String trimType(String filename) { + int index = filename.lastIndexOf("."); + if (index != -1) { + return filename.substring(0, index); + } else { + return filename; + } + } + + /** + * 得到相对路径。 + * 文件名不是目录名的子节点时返回文件名。 + * + * @param pathName 目录名 + * @param fileName 文件名 + * @return 得到文件名相对于目录名的相对路径，目录下不存在该文件时返回文件名 + * @since 1.0 + */ + public static String getSubpath(String pathName, String fileName) { + int index = fileName.indexOf(pathName); + if (index != -1) { + return fileName.substring(index + pathName.length() + 1); + } else { + return fileName; + } + } + + /** + * 检查给定目录的存在性 + * 保证指定的路径可用，如果指定的路径不存在，那么建立该路径，可以为多级路径 + * + * @param path + * @return 真假值 + * @since 1.0 + */ + public static final boolean pathValidate(String path) { + //String path="d:/web/www/sub"; + //System.out.println(path); + //path = getUNIXfilePath(path); + + //path = ereg_replace("^\\/+", "", path); + //path = ereg_replace("\\/+$", "", path); + String[] arraypath = path.split("/"); + String tmppath = ""; + for (int i = 0; i < arraypath.length; i++) { + tmppath += "/" + arraypath[i]; + File d = new File(tmppath.substring(1)); + if (!d.exists()) { //检查Sub目录是否存在 + System.out.println(tmppath.substring(1)); + if (!d.mkdir()) { + return false; + } + } + } + return true; + } + + /** + * 读取文件的内容 + * 读取指定文件的内容 + * + * @param path 为要读取文件的绝对路径 + * @return 以行读取文件后的内容。 + * @since 1.0 + */ + public static final String getFileContent(String path) throws IOException { + String filecontent = ""; + try { + File f = new File(path); + if (f.exists()) { + FileReader fr = new FileReader(path); + BufferedReader br = new BufferedReader(fr); //建立BufferedReader对象，并实例化为br + String line = br.readLine(); //从文件读取一行字符串 + //判断读取到的字符串是否不为空 + while (line != null) { + filecontent += line + "\n"; + line = br.readLine(); //从文件中继续读取一行数据 + } + br.close(); //关闭BufferedReader对象 + fr.close(); //关闭文件 + } + + } catch (IOException e) { + throw e; + } + return filecontent; + } + + /** + * 根据内容生成文件 + * + * @param path 要生成文件的绝对路径， + * @param modulecontent 文件的内容。 + * @return 真假值 + * @since 1.0 + */ + public static final boolean genModuleTpl(String path, String modulecontent) throws IOException { + + path = getUNIXfilePath(path); + String[] patharray = path.split("\\/"); + String modulepath = ""; + for (int i = 0; i < patharray.length - 1; i++) { + modulepath += "/" + patharray[i]; + } + File d = new File(modulepath.substring(1)); + if (!d.exists()) { + if (!pathValidate(modulepath.substring(1))) { + return false; + } + } + try { + FileWriter fw = new FileWriter(path); //建立FileWriter对象，并实例化fw + //将字符串写入文件 + fw.write(modulecontent); + fw.close(); + } catch (IOException e) { + throw e; + } + return true; + } + + /** + * 获取图片文件的扩展名（发布系统专用） + * + * @param pic_path 为图片名称加上前面的路径不包括扩展名 + * @return 图片的扩展名 + * @since 1.0 + */ + public static final String getPicExtendName(String pic_path) { + pic_path = getUNIXfilePath(pic_path); + String pic_extend = ""; + if (isFileExist(pic_path + ".gif")) { + pic_extend = ".gif"; + } + if (isFileExist(pic_path + ".jpeg")) { + pic_extend = ".jpeg"; + } + if (isFileExist(pic_path + ".jpg")) { + pic_extend = ".jpg"; + } + if (isFileExist(pic_path + ".png")) { + pic_extend = ".png"; + } + return pic_extend; //返回图片扩展名 + } + + /** + * 拷贝文件 + * + * @param in 输入文件 + * @param out 输出文件 + * @return + * @throws Exception + */ + public static final boolean CopyFile(File in, File out) throws Exception { + try { + FileInputStream fis = new FileInputStream(in); + FileOutputStream fos = new FileOutputStream(out); + byte[] buf = new byte[1024]; + int i = 0; + while ((i = fis.read(buf)) != -1) { + fos.write(buf, 0, i); + } + fis.close(); + fos.close(); + return true; + } catch (IOException ie) { + ie.printStackTrace(); + return false; + } + } + + /** + * 拷贝文件 + * + * @param infile 输入字符串 + * @param outfile 输出字符串 + * @return + * @throws Exception + */ + public static final boolean CopyFile(String infile, String outfile) throws Exception { + try { + File in = new File(infile); + File out = new File(outfile); + return CopyFile(in, out); + } catch (IOException ie) { + ie.printStackTrace(); + return false; + } + + } + + /** + * 把内容content写的path文件中 + * + * @param content 输入内容 + * @param path 文件路径 + * @return + */ + public static boolean SaveFileAs(String content, String path) { + FileWriter fw = null; + try { + fw = new FileWriter(new File(path), false); + if (content != null) { + fw.write(content); + } + } catch (IOException e) { + e.printStackTrace(); + return false; + } finally { + if (fw != null) { + try { + fw.flush(); + fw.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return true; + } + + /** + * 以字节为单位读取文件，常用于读二进制文件，如图片、声音、影像等文件。 + */ + public static byte[] readFileByBytes(String fileName) throws IOException { + FileInputStream in = new FileInputStream(fileName); + byte[] bytes = null; + try { + + ByteArrayOutputStream out = new ByteArrayOutputStream(1024); + + byte[] temp = new byte[1024]; + + int size = 0; + + while ((size = in.read(temp)) != -1) { + out.write(temp, 0, size); + } + + in.close(); + + bytes = out.toByteArray(); + + } catch (Exception e1) { + e1.printStackTrace(); + } finally { + if (in != null) { + in.close(); + } + } + return bytes; + } + + /** + * 以字符为单位读取文件，常用于读文本，数字等类型的文件 + */ + public static void readFileByChars(String fileName) { + File file = new File(fileName); + Reader reader = null; + try { + System.out.println("以字符为单位读取文件内容，一次读一个字节："); + // 一次读一个字符 + reader = new InputStreamReader(new FileInputStream(file)); + int tempchar; + while ((tempchar = reader.read()) != -1) { + // 对于windows下，\r\n这两个字符在一起时，表示一个换行。 + // 但如果这两个字符分开显示时，会换两次行。 + // 因此，屏蔽掉\r，或者屏蔽\n。否则，将会多出很多空行。 + if (((char) tempchar) != '\r') { + System.out.print((char) tempchar); + } + } + reader.close(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + System.out.println("以字符为单位读取文件内容，一次读多个字节："); + // 一次读多个字符 + char[] tempchars = new char[30]; + int charread = 0; + reader = new InputStreamReader(new FileInputStream(fileName)); + // 读入多个字符到字符数组中，charread为一次读取字符数 + while ((charread = reader.read(tempchars)) != -1) { + // 同样屏蔽掉\r不显示 + if ((charread == tempchars.length) + && (tempchars[tempchars.length - 1] != '\r')) { + System.out.print(tempchars); + } else { + for (int i = 0; i < charread; i++) { + if (tempchars[i] == '\r') { + continue; + } else { + System.out.print(tempchars[i]); + } + } + } + } + + } catch (Exception e1) { + e1.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + } + } + } + } + + /** + * 以行为单位读取文件，常用于读面向行的格式化文件 + */ + public static List readFileByLines(String fileName) { + List returnString = new ArrayList(); + File file = new File(fileName); + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(file)); + String tempString = null; + int line = 1; + // 一次读入一行，直到读入null为文件结束 + while ((tempString = reader.readLine()) != null) { + // 显示行号 + returnString.add(tempString); + line++; + } + reader.close(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + } + } + } + return returnString; + } + + /** + * 随机读取文件内容 + */ + public static void readFileByRandomAccess(String fileName) { + RandomAccessFile randomFile = null; + try { + System.out.println("随机读取一段文件内容："); + // 打开一个随机访问文件流，按只读方式 + randomFile = new RandomAccessFile(fileName, "r"); + // 文件长度，字节数 + long fileLength = randomFile.length(); + // 读文件的起始位置 + int beginIndex = (fileLength > 4) ? 4 : 0; + // 将读文件的开始位置移到beginIndex位置。 + randomFile.seek(beginIndex); + byte[] bytes = new byte[10]; + int byteread = 0; + // 一次读10个字节，如果文件内容不足10个字节，则读剩下的字节。 + // 将一次读取的字节数赋给byteread + while ((byteread = randomFile.read(bytes)) != -1) { + System.out.write(bytes, 0, byteread); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (randomFile != null) { + try { + randomFile.close(); + } catch (IOException e1) { + } + } + } + } + + /** + * 读取文件内容 + * + * @param fileName + * @return + */ + public static String readFileAll(String fileName) { + String encoding = "UTF-8"; + File file = new File(fileName); + Long filelength = file.length(); + byte[] filecontent = new byte[filelength.intValue()]; + try { + FileInputStream in = new FileInputStream(file); + in.read(filecontent); + in.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + try { + return new String(filecontent, encoding); + } catch (UnsupportedEncodingException e) { + System.err.println("The OS does not support " + encoding); + e.printStackTrace(); + return ""; + } + } + + /** + * 显示输入流中还剩的字节数 + */ + private static void showAvailableBytes(InputStream in) { + try { + System.out.println("当前字节输入流中的字节数为:" + in.available()); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/ITextPDFCellConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/util/ITextPDFCellConfig.java new file mode 100644 index 0000000..47fc754 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/ITextPDFCellConfig.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.util; + +import com.itextpdf.text.Font; +import lombok.Data; + +@Data +public class ITextPDFCellConfig { + private String key; //键 + private String value; //值 + private int keyWidth; //键宽度 + private int valueWidth; //值宽度 + private Font font; //字体，含中文的字符串必须添加，否则乱码 + private int fixedHeight; //行高 + private int totalColumn; //总宽度 + private int cellMaxColumn; //单元格最大宽度 + private int disableBorderSide; //单元格边框设置 0：不隐藏，7：隐藏左、上、下边框，13：隐藏上、左、右边框，15：隐藏全部。 + private int horizontalAlignment; //设置水平位置 0：靠左，1：居中，2：靠右 +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/IpUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/IpUtils.java new file mode 100644 index 0000000..5cbc5ee --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/IpUtils.java @@ -0,0 +1,57 @@ +package com.glxp.sale.admin.util; + +import org.springframework.scheduling.annotation.Async; + +import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; + +public class IpUtils { + + /** + * 获取客户端IP地址 + * + * @param request + * @return + */ + public static String getIpAddr(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + if (ip.equals("127.0.0.1")) { + //根据网卡取本机配置的IP + InetAddress inet = null; + try { + inet = InetAddress.getLocalHost(); + ip = inet.getHostAddress(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + // 多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 + if (ip != null && ip.length() > 15) { + if (ip.indexOf(",") > 0) { + ip = ip.substring(0, ip.indexOf(",")); + } + } + return ip; + } + + @Async + public void asyncOrder() { + System.out.println("执行异步任务: "); + System.out.println("线程名称：" + Thread.currentThread().getName() + " be ready to read data!"); + try { + Thread.sleep(1000 * 5); + System.out.println("---------------------》》》无返回值延迟3秒："); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java new file mode 100644 index 0000000..381d4e4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java @@ -0,0 +1,86 @@ +package com.glxp.sale.admin.util; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Component; + +import com.alibaba.fastjson.JSON; + +import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JasperExportManager; +import net.sf.jasperreports.engine.JasperFillManager; +import net.sf.jasperreports.engine.JasperPrint; +import net.sf.jasperreports.engine.JasperReport; +import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter; +import net.sf.jasperreports.engine.query.JsonQueryExecuterFactory; +import net.sf.jasperreports.engine.util.JRLoader; +import net.sf.jasperreports.export.SimpleExporterInput; +import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput; + +/** + * Jasperreport工具类 + * @author chenqf + * @date 2021-11-10 22:23 + */ +@Component +public class JasperUtils { + private static Logger logger = LoggerFactory.getLogger(JasperUtils.class); + + public static final String PDF_TYPE="pdf"; + public static final String WORD_TYPE="word"; + public static final String EXCEL_TYPE="excel"; + public static final String HTML_TYPE="html"; + /* + * data 传入报表数据 + * jasperResource 模板文件路径 + */ + public static void jasperReport(HttpServletRequest request, HttpServletResponse response,Map data,String jasperResource,String type) throws IOException, JRException { + try { + HashMap map = new HashMap(); + InputStream is = new ByteArrayInputStream(JSON.toJSONString(data).getBytes("UTF-8")); + map.put("JSON_INPUT_STREAM", is); //填充报表数据 + map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH); + + ClassPathResource resource = new ClassPathResource(jasperResource); + + InputStream jasperStream = resource.getInputStream(); + + JasperReport jasperReport = (JasperReport) JRLoader.loadObject(jasperStream); + //报表填充 + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, map); + String fileName = new String("export.pdf".getBytes("GBK"), "ISO8859_1"); + ServletOutputStream os = response.getOutputStream(); + response.setDateHeader("Expires", 0); + response.setHeader("Content-disposition","attachment; filename="+fileName); + if(type!=null&&WORD_TYPE.equals(type)) { + response.setContentType("appliction/msword; charset=utf-8"); + JRDocxExporter exporter = new JRDocxExporter(); + exporter.setExporterInput(new SimpleExporterInput(jasperPrint)); + exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(os)); + exporter.exportReport(); + } else { + response.setContentType("application/pdf; charset=utf-8"); + JasperExportManager.exportReportToPdfStream(jasperPrint,os); + os.flush(); + os.close(); + } + } catch (Exception e) { + + e.printStackTrace(); + + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/JwtUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/JwtUtils.java new file mode 100644 index 0000000..ed92500 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/JwtUtils.java @@ -0,0 +1,104 @@ +package com.glxp.sale.admin.util; + +import io.jsonwebtoken.*; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; +import java.util.Base64; +import java.util.Date; +import java.util.Map; + +/** + * jwt + */ +public class JwtUtils { + + /** + * 生成 token + * + * @param claims 自定义的 map + * @param ttl 过期时间 + * @return + */ + public static String createToken(Map claims, Long ttl) { + Key key = generateKey(); + SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256; + Long nowMillis = System.currentTimeMillis(); //生成JWT的时间 + JwtBuilder builder = Jwts.builder() + .setHeaderParam("typ", "JWT") //设置header + .setHeaderParam("alg", "HS256") + .setClaims(claims) //设置payload的键值对 + // .setIssuedAt(now) //设置iat + // .setIssuer("vue-sale") + .signWith(signatureAlgorithm, key); //签名，需要算法和key + if (ttl != null && ttl >= 0) { + Long expMillis = nowMillis + ttl * 1000; + Date exp = new Date(expMillis); + builder.setExpiration(exp); //设置过期时间 + } + + String token = builder.compact(); + + return token; + } + + public static String createJWT(String id, long ttlMillis) { + SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256; + long nowMillis = System.currentTimeMillis(); + Date now = new Date(nowMillis); + SecretKey secretKey = generateKey(); + JwtBuilder builder = Jwts.builder().setId(id) // 主题 + .setIssuer("user") // 签发者 + .setIssuedAt(now) // 签发时间 + .signWith(signatureAlgorithm, secretKey); // 签名算法以及密匙 + if (ttlMillis >= 0) { + long expMillis = nowMillis + ttlMillis; + Date expDate = new Date(expMillis); + builder.setExpiration(expDate); // 过期时间 + } + return builder.compact(); + } + + /** + * 生成 token ，没有过期时间 + * + * @param claims 自定义的 map + * @return + */ + public static String createToken(Map claims) { + return createToken(claims, null); + } + + /** + * 解密 jwt + * @param jwt 创建的 jwt 字符串 + * @return + */ + public static Claims parse(String jwt) { + + if (jwt == null) { + return null; + } + + try { + return Jwts.parser() + .setSigningKey(generateKey()) //此处的key要与之前创建的key一致 + .parseClaimsJws(jwt) + .getBody(); + }catch (ExpiredJwtException e){ + return null; + } + } + + /** + * 获取 key + * + * @return + */ + private static SecretKey generateKey() { + String stringKey = "udicapi"; + byte[] encodedKey = Base64.getDecoder().decode(stringKey); + return new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES"); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/Md5Utils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/Md5Utils.java new file mode 100644 index 0000000..bfd07b7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/Md5Utils.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.util; + +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class Md5Utils { + + public static String stringToMD5(String plainText) { + byte[] secretBytes = null; + try { + secretBytes = MessageDigest.getInstance("md5").digest( + plainText.getBytes()); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("没有这个md5算法！"); + } + String md5code = new BigInteger(1, secretBytes).toString(16); + for (int i = 0; i < 32 - md5code.length(); i++) { + md5code = "0" + md5code; + } + return md5code; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/PasswordUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/PasswordUtils.java new file mode 100644 index 0000000..710767f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/PasswordUtils.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.util; + +/** + * 密码相关的工具类 + */ +public class PasswordUtils { + + public static String authAdminPwd(String pwd) { +// return DigestUtils.md5DigestAsHex(DigestUtils.md5DigestAsHex(pwd.getBytes()).getBytes()).toLowerCase(); + return pwd; + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/PermissionRuleTreeUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/PermissionRuleTreeUtils.java new file mode 100644 index 0000000..4fd88d1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/PermissionRuleTreeUtils.java @@ -0,0 +1,36 @@ +package com.glxp.sale.admin.util; + +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; +import org.springframework.beans.BeanUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * 权限规则生成树形节点工具类 + */ +public class PermissionRuleTreeUtils { + + /** + * 多维数组 + */ + public static List merge(List authPermissionRuleList, + Long pid) { + + List authPermissionRuleMergeResponseList = new ArrayList<>(); + for (AuthPermissionRule v : authPermissionRuleList) { + AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse(); + BeanUtils.copyProperties(v, authPermissionRuleMergeResponse); + if (pid.equals(v.getPid())) { + authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId())); + authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse); + } + } + + return authPermissionRuleMergeResponseList; + } + + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/PublicFileUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/PublicFileUtils.java new file mode 100644 index 0000000..d6c8c0b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/PublicFileUtils.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.util; + +import com.glxp.sale.admin.config.PublicFileUrlConfig; + +/** + * 公共文件管理工具 + */ +public class PublicFileUtils { + + public static String createUploadUrl(String filePath) { + + if (filePath == null || filePath.isEmpty()) { + return ""; + } + + if (filePath.indexOf("http") == 0 || filePath.indexOf("/") == 0) { + return filePath; + } + + return PublicFileUrlConfig.getDomain() + "/" + filePath; + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/QRCodeUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/QRCodeUtil.java new file mode 100644 index 0000000..9410253 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/QRCodeUtil.java @@ -0,0 +1,211 @@ +package com.glxp.sale.admin.util; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.StrUtil; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; + +import javax.imageio.ImageIO; +import javax.servlet.ServletOutputStream; +import java.awt.*; +import java.awt.geom.RoundRectangle2D; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URL; +import java.util.HashMap; + +/** + *

QRCodeUtil

+ * + * @author lvhaosir6 + * @version 1.0.0 + * @date 2020/7/8 + */ +@Slf4j +@UtilityClass +public class QRCodeUtil { + /** + * 默认宽度 + */ + private static final Integer WIDTH = 140; + /** + * 默认高度 + */ + private static final Integer HEIGHT = 140; + + /** + * LOGO 默认宽度 + */ + private static final Integer LOGO_WIDTH = 22; + /** + * LOGO 默认高度 + */ + private static final Integer LOGO_HEIGHT = 22; + + /** + * 图片格式 + */ + private static final String IMAGE_FORMAT = "png"; + private static final String CHARSET = "utf-8"; + /** + * 原生转码前面没有 data:image/png;base64 这些字段，返回给前端是无法被解析 + */ + private static final String BASE64_IMAGE = "data:image/png;base64,%s"; + + /** + * 生成二维码，使用默认尺寸 + * + * @param content 内容 + * @return + */ + public String getBase64QRCode(String content) { + return getBase64Image(content, WIDTH, HEIGHT, null, null, null); + } + + /** + * 生成二维码，使用默认尺寸二维码，插入默认尺寸logo + * + * @param content 内容 + * @param logoUrl logo地址 + * @return + */ + public String getBase64QRCode(String content, String logoUrl) { + return getBase64Image(content, WIDTH, HEIGHT, logoUrl, LOGO_WIDTH, LOGO_HEIGHT); + } + + /** + * 生成二维码 + * + * @param content 内容 + * @param width 二维码宽度 + * @param height 二维码高度 + * @param logoUrl logo 在线地址 + * @param logoWidth logo 宽度 + * @param logoHeight logo 高度 + * @return + */ + public String getBase64QRCode(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) { + return getBase64Image(content, width, height, logoUrl, logoWidth, logoHeight); + } + + private String getBase64Image(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + BufferedImage bufferedImage = crateQRCode(content, width, height, logoUrl, logoWidth, logoHeight); + try { + ImageIO.write(bufferedImage, IMAGE_FORMAT, os); + } catch (IOException e) { + log.error("[生成二维码，错误{}]", e); + } + // 转出即可直接使用 + return String.format(BASE64_IMAGE, Base64.encode(os.toByteArray())); + } + + + /** + * 生成二维码 + * + * @param content 内容 + * @param width 二维码宽度 + * @param height 二维码高度 + * @param logoUrl logo 在线地址 + * @param logoWidth logo 宽度 + * @param logoHeight logo 高度 + * @return + */ + private BufferedImage crateQRCode(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) { + if (StrUtil.isNotBlank(content)) { + ServletOutputStream stream = null; + HashMap hints = new HashMap<>(4); + // 指定字符编码为utf-8 + hints.put(EncodeHintType.CHARACTER_SET, CHARSET); + // 指定二维码的纠错等级为中级 + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); + // 设置图片的边距 + hints.put(EncodeHintType.MARGIN, 2); + try { + QRCodeWriter writer = new QRCodeWriter(); + BitMatrix bitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, width, height, hints); + BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF); + } + } + if (StrUtil.isNotBlank(logoUrl)) { + insertLogo(bufferedImage, width, height, logoUrl, logoWidth, logoHeight); + } + return bufferedImage; + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (stream != null) { + try { + stream.flush(); + stream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + return null; + } + + /** + * 二维码插入logo + * + * @param source 二维码 + * @param width 二维码宽度 + * @param height 二维码高度 + * @param logoUrl logo 在线地址 + * @param logoWidth logo 宽度 + * @param logoHeight logo 高度 + * @throws Exception + */ + private void insertLogo(BufferedImage source, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) throws Exception { + // logo 源可为 File/InputStream/URL + Image src = ImageIO.read(new URL(logoUrl)); + // 插入LOGO + Graphics2D graph = source.createGraphics(); + int x = (width - logoWidth) / 2; + int y = (height - logoHeight) / 2; + graph.drawImage(src, x, y, logoWidth, logoHeight, null); + Shape shape = new RoundRectangle2D.Float(x, y, logoWidth, logoHeight, 6, 6); + graph.setStroke(new BasicStroke(3f)); + graph.draw(shape); + graph.dispose(); + } + + + /** + * 获取二维码 + * + * @param content 内容 + * @param output 输出流 + * @throws IOException + */ + public void getQRCode(String content, OutputStream output) throws IOException { + BufferedImage image = crateQRCode(content, WIDTH, HEIGHT, null, null, null); + ImageIO.write(image, IMAGE_FORMAT, output); + } + + /** + * 获取二维码 + * + * @param content 内容 + * @param logoUrl logo资源 + * @param output 输出流 + * @throws Exception + */ + public void getQRCode(String content, String logoUrl, OutputStream output) throws Exception { + BufferedImage image = crateQRCode(content, WIDTH, HEIGHT, logoUrl, LOGO_WIDTH, LOGO_HEIGHT); + ImageIO.write(image, IMAGE_FORMAT, output); + } + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/RedisUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/RedisUtil.java new file mode 100644 index 0000000..d29b74b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/RedisUtil.java @@ -0,0 +1,577 @@ +package com.glxp.sale.admin.util; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * redisTemplate封装 + * + * @author zjjlive@dist.com.cn + */ +@Component +public class RedisUtil { + + @Autowired + private RedisTemplate redisTemplate; + + public RedisUtil(RedisTemplate redisTemplate) { + this.redisTemplate = redisTemplate; + } + + /** + * 指定缓存失效时间 + * + * @param key 键 + * @param time 时间(秒) + * @return + */ + public boolean expire(String key, long time) { + try { + if (time > 0) { + redisTemplate.expire(key, time, TimeUnit.SECONDS); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 根据key 获取过期时间 + * + * @param key 键 不能为null + * @return 时间(秒) 返回0代表为永久有效 + */ + public long getExpire(String key) { + return redisTemplate.getExpire(key, TimeUnit.SECONDS); + } + + /** + * 判断key是否存在 + * + * @param key 键 + * @return true 存在 false不存在 + */ + public boolean hasKey(String key) { + try { + return redisTemplate.hasKey(key); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 删除缓存 + * + * @param key 可以传一个值 或多个 + */ + @SuppressWarnings("unchecked") + public void del(String... key) { + if (key != null && key.length > 0) { + if (key.length == 1) { + redisTemplate.delete(key[0]); + } else { + redisTemplate.delete(CollectionUtils.arrayToList(key)); + } + } + } + + //============================String============================= + + /** + * 普通缓存获取 + * + * @param key 键 + * @return 值 + */ + public Object get(String key) { + return key == null ? null : redisTemplate.opsForValue().get(key); + } + + /** + * 普通缓存放入 + * + * @param key 键 + * @param value 值 + * @return true成功 false失败 + */ + public boolean set(String key, Object value) { + try { + redisTemplate.opsForValue().set(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 普通缓存放入并设置时间 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期 + * @return true成功 false 失败 + */ + public boolean set(String key, Object value, long time) { + try { + if (time > 0) { + redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); + } else { + set(key, value); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 递增 + * + * @param key 键 + * @param delta 要增加几(大于0) + * @return + */ + public long incr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递增因子必须大于0"); + } + return redisTemplate.opsForValue().increment(key, delta); + } + + /** + * 递减 + * + * @param key 键 + * @param delta 要减少几(小于0) + * @return + */ + public long decr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递减因子必须大于0"); + } + return redisTemplate.opsForValue().increment(key, -delta); + } + + //================================Map================================= + + /** + * HashGet + * + * @param key 键 不能为null + * @param item 项 不能为null + * @return 值 + */ + public Object hget(String key, String item) { + return redisTemplate.opsForHash().get(key, item); + } + + /** + * 获取hashKey对应的所有键值 + * + * @param key 键 + * @return 对应的多个键值 + */ + public Map hmget(String key) { + return redisTemplate.opsForHash().entries(key); + } + + /** + * HashSet + * + * @param key 键 + * @param map 对应多个键值 + * @return true 成功 false 失败 + */ + public boolean hmset(String key, Map map) { + try { + redisTemplate.opsForHash().putAll(key, map); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * HashSet 并设置时间 + * + * @param key 键 + * @param map 对应多个键值 + * @param time 时间(秒) + * @return true成功 false失败 + */ + public boolean hmset(String key, Map map, long time) { + try { + redisTemplate.opsForHash().putAll(key, map); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * + * @param key 键 + * @param item 项 + * @param value 值 + * @return true 成功 false失败 + */ + public boolean hset(String key, String item, Object value) { + try { + redisTemplate.opsForHash().put(key, item, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * + * @param key 键 + * @param item 项 + * @param value 值 + * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 + * @return true 成功 false失败 + */ + public boolean hset(String key, String item, Object value, long time) { + try { + redisTemplate.opsForHash().put(key, item, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 删除hash表中的值 + * + * @param key 键 不能为null + * @param item 项 可以使多个 不能为null + */ + public void hdel(String key, Object... item) { + redisTemplate.opsForHash().delete(key, item); + } + + /** + * 判断hash表中是否有该项的值 + * + * @param key 键 不能为null + * @param item 项 不能为null + * @return true 存在 false不存在 + */ + public boolean hHasKey(String key, String item) { + return redisTemplate.opsForHash().hasKey(key, item); + } + + /** + * hash递增 如果不存在,就会创建一个 并把新增后的值返回 + * + * @param key 键 + * @param item 项 + * @param by 要增加几(大于0) + * @return + */ + public double hincr(String key, String item, double by) { + return redisTemplate.opsForHash().increment(key, item, by); + } + + /** + * hash递减 + * + * @param key 键 + * @param item 项 + * @param by 要减少记(小于0) + * @return + */ + public double hdecr(String key, String item, double by) { + return redisTemplate.opsForHash().increment(key, item, -by); + } + + //============================set============================= + + /** + * 根据key获取Set中的所有值 + * + * @param key 键 + * @return + */ + public Set sGet(String key) { + try { + return redisTemplate.opsForSet().members(key); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 根据value从一个set中查询,是否存在 + * + * @param key 键 + * @param value 值 + * @return true 存在 false不存在 + */ + public boolean sHasKey(String key, Object value) { + try { + return redisTemplate.opsForSet().isMember(key, value); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将数据放入set缓存 + * + * @param key 键 + * @param values 值 可以是多个 + * @return 成功个数 + */ + public long sSet(String key, Object... values) { + try { + return redisTemplate.opsForSet().add(key, values); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 将set数据放入缓存 + * + * @param key 键 + * @param time 时间(秒) + * @param values 值 可以是多个 + * @return 成功个数 + */ + public long sSetAndTime(String key, long time, Object... values) { + try { + Long count = redisTemplate.opsForSet().add(key, values); + if (time > 0) { + expire(key, time); + } + return count; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 获取set缓存的长度 + * + * @param key 键 + * @return + */ + public long sGetSetSize(String key) { + try { + return redisTemplate.opsForSet().size(key); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 移除值为value的 + * + * @param key 键 + * @param values 值 可以是多个 + * @return 移除的个数 + */ + public long setRemove(String key, Object... values) { + try { + Long count = redisTemplate.opsForSet().remove(key, values); + return count; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + //===============================list================================= + + /** + * 获取list缓存的内容 + * + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return + */ + public List lGet(String key, long start, long end) { + try { + return redisTemplate.opsForList().range(key, start, end); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 获取list缓存的长度 + * + * @param key 键 + * @return + */ + public long lGetListSize(String key) { + try { + return redisTemplate.opsForList().size(key); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 通过索引 获取list中的值 + * + * @param key 键 + * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 + * @return + */ + public Object lGetIndex(String key, long index) { + try { + return redisTemplate.opsForList().index(key, index); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @return + */ + public boolean lSet(String key, Object value) { + try { + redisTemplate.opsForList().rightPush(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) + * @return + */ + public boolean lSet(String key, Object value, long time) { + try { + redisTemplate.opsForList().rightPush(key, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @return + */ + public boolean lSet(String key, List value) { + try { + redisTemplate.opsForList().rightPushAll(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) + * @return + */ + public boolean lSet(String key, List value, long time) { + try { + redisTemplate.opsForList().rightPushAll(key, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 根据索引修改list中的某条数据 + * + * @param key 键 + * @param index 索引 + * @param value 值 + * @return + */ + public boolean lUpdateIndex(String key, long index, Object value) { + try { + redisTemplate.opsForList().set(key, index, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 移除N个值为value + * + * @param key 键 + * @param count 移除多少个 + * @param value 值 + * @return 移除的个数 + */ + public long lRemove(String key, long count, Object value) { + try { + Long remove = redisTemplate.opsForList().remove(key, count, value); + return remove; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/StockOrderBillNoUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/StockOrderBillNoUtils.java new file mode 100644 index 0000000..93990ae --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/StockOrderBillNoUtils.java @@ -0,0 +1,29 @@ +package com.glxp.sale.admin.util; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.UUID; + +public class StockOrderBillNoUtils { + + public static String getBillNo(String action) { + + String prefix = ""; + switch (action) { + case "deliveryNote": + prefix = "SHD"; + break; + default: + prefix = "SP"; + break; + } + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = new Date(); + String dateStr = simpleDateFormat.format(date); + String randomStr = String.valueOf(((int) (Math.random() * 89997 + 1) + 10000)); + String rStr = prefix + dateStr + randomStr; + + return rStr; + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/TreeUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/TreeUtils.java new file mode 100644 index 0000000..4195115 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/TreeUtils.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.util; + +/** + * 树形结构工具类 + */ +public class TreeUtils { + + public static void Merge() { + + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/UdidConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/util/UdidConfig.java new file mode 100644 index 0000000..dd5728c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/UdidConfig.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.util; + +public class UdidConfig { + + public static final String betaUrl = "https://udid.nmpa.gov.cn/sale/beta/v1/"; + + public static final String apiUrl = "https://udid.nmpa.gov.cn/sale/v1/"; + + public static final String AppId = "371ced236e844272ad14bbe9051fd25a"; + public static final String AppSecret = "592e7a00a7304f52a86a82e7fac9d2c0"; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/UuidUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/UuidUtils.java new file mode 100644 index 0000000..42e2d3f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/UuidUtils.java @@ -0,0 +1,42 @@ +package com.glxp.sale.admin.util; + +import java.util.UUID; + +public class UuidUtils { + + public static String getUUId() { + UUID uuid = UUID.randomUUID(); + return uuid.toString().replace("-", ""); + } + + public static String[] chars = new String[]{"a", "b", "c", "d", "e", "f", + "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", + "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", + "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", + "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", + "W", "X", "Y", "Z"}; + + public static String getShortUuid() { + StringBuffer shortBuffer = new StringBuffer(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + for (int i = 0; i < 8; i++) { + String str = uuid.substring(i * 4, i * 4 + 4); + int x = Integer.parseInt(str, 16); + shortBuffer.append(chars[x % 0x3E]); + } + return shortBuffer.toString(); + } + + public static String getShortUuid(int idLength) { + if (idLength <= 0) idLength = 4; + StringBuffer shortBuffer = new StringBuffer(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + for (int i = 0; i < idLength; i++) { + String str = uuid.substring(i * 4, i * 4 + 4); + int x = Integer.parseInt(str, 16); + shortBuffer.append(chars[x % 0x3E]); + } + return shortBuffer.toString(); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/serializer/Date2LongSerializer.java b/api-admin/src/main/java/com/glxp/sale/admin/util/serializer/Date2LongSerializer.java new file mode 100644 index 0000000..97fadcd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/serializer/Date2LongSerializer.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.util.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.util.Date; + +/** + * 毫秒转成秒 + * 只需要在需要序列化的属性上面加上这个注解 | @JsonSerialize(using = Date2LongSerializer.class) + */ +public class Date2LongSerializer extends JsonSerializer { + + @Override + public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + jsonGenerator.writeNumber(date.getTime() / 1000); + } +} diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties new file mode 100644 index 0000000..46fa708 --- /dev/null +++ b/api-admin/src/main/resources/application-pro.properties @@ -0,0 +1,65 @@ +# \u751F\u4EA7\u73AF\u5883 +server.port=9989 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udispsync?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +#spring.datasource.password=root +spring.datasource.password=123456 +#server.servlet.context-path= +#logging.level.com.glxp.sale.admin.dao=debug +# \u8DE8\u57DF\u8BBE\u7F6E +cors.allowed-origins=* +cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN +cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS +cors.allowed-Credentials=true +#\u8BF7\u6C42\u53C2\u6570\u957F\u5EA6 +server.tomcat.max-http-form-post-size=100MB +server.max-http-header-size=100MB +#\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB) +spring.servlet.multipart.max-file-size=104857600 +spring.servlet.multipart.max-request-size=104857600 +server.connectionTimeout=180000 +#logging.level.com.glxp.sale.admin.dao=debug +# \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002 +logging.file=D:/1s/udiwms/udiwms.log +file_path=D:/1s/udiwms/sp/order/sync +back_file_path=D:/1s/udiwms/sp/order/sync/sync_back +#UDI\u6570\u636E\u4E0B\u8F7D +UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server +#UCLOD\u670D\u52A1 +#UCLOD_SERVER_URL=http://127.0.0.1:9997 +#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER +UCLOD_SERVER_URL=http://139.9.178.73:8080/UDIC_UCLOUD_SERVER +#mips\u670D\u52A1\u5730\u5740 +UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server +#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997 +UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query" +#\u534F\u8C03\u5E73\u53F0\u5BA2\u6237\u7AEF\u5730\u5740 +COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload +#\u5185\u5B58\u7801\u751F\u6210 +STOCK_PRINT_POST=http://139.159.187.130:8080/UDI_WMS_MC/udiwms/stockprint/post +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss +spring.jackson.time-zone=GMT+8 +#UDIWMS_IP=http://139.159.187.130:8080/UDI_WMS_MC +UDIWMS_IP=http://127.0.0.1:9991 +SPMS_IP=http://127.0.0.1:9996 +#SPMS_IP=http://139.159.187.130:8080/SPMS_SERVER +##端口号 +# Redis数据库索引（默认为0） +spring.redis.database=0 +# Redis服务器地址 +spring.redis.host=127.0.0.1 +# Redis服务器连接端口 +spring.redis.port=6379 +# Redis服务器连接密码（默认为空） +spring.redis.password= +#连接池最大连接数（使用负值表示没有限制） +spring.redis.jedis.pool.max-active=8 +# 连接池最大阻塞等待时间（使用负值表示没有限制） +spring.redis.jedis.pool.max-wait=-1 +# 连接池中的最大空闲连接 +spring.redis.jedis.pool.max-idle=8 +# 连接池中的最小空闲连接 +spring.redis.jedis.pool.min-idle=0 +# 连接超时时间（毫秒） +spring.redis.jedis.timeout=300 \ No newline at end of file diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties new file mode 100644 index 0000000..0f5d7b4 --- /dev/null +++ b/api-admin/src/main/resources/application.properties @@ -0,0 +1,8 @@ +spring.profiles.active=pro + +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +mybatis.config-location=classpath:mybatis/mybatis-config.xml +mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml + +spring.jmx.enabled=false \ No newline at end of file diff --git a/api-admin/src/main/resources/fonts/STSONG.TTF b/api-admin/src/main/resources/fonts/STSONG.TTF new file mode 100644 index 0000000..3870605 Binary files /dev/null and b/api-admin/src/main/resources/fonts/STSONG.TTF differ diff --git a/api-admin/src/main/resources/fonts/fonts.xml b/api-admin/src/main/resources/fonts/fonts.xml new file mode 100644 index 0000000..3cf8d56 --- /dev/null +++ b/api-admin/src/main/resources/fonts/fonts.xml @@ -0,0 +1,15 @@ + + + + fonts/STSONG.TTF + fonts/STSONG.TTF + fonts/STSONG.TTF + fonts/STSONG.TTF + Identity-H + true + + '华文宋体', Arial, Helvetica, sans-serif + '华文宋体', Arial, Helvetica, sans-serif + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/jasperreports_extension.properties b/api-admin/src/main/resources/jasperreports_extension.properties new file mode 100644 index 0000000..e0ac0bf --- /dev/null +++ b/api-admin/src/main/resources/jasperreports_extension.properties @@ -0,0 +1,2 @@ +net.sf.jasperreports.extension.registry.factory.simple.font.families=net.sf.jasperreports.engine.fonts.SimpleFontExtensionsRegistryFactory +net.sf.jasperreports.extension.simple.font.families.lobstertwo=fonts/fonts.xml diff --git a/api-admin/src/main/resources/jaspers/isn_print_1.jasper b/api-admin/src/main/resources/jaspers/isn_print_1.jasper new file mode 100644 index 0000000..e94ceed Binary files /dev/null and b/api-admin/src/main/resources/jaspers/isn_print_1.jasper differ diff --git a/api-admin/src/main/resources/jaspers/isn_print_1.jrxml b/api-admin/src/main/resources/jaspers/isn_print_1.jrxml new file mode 100644 index 0000000..01a6f12 --- /dev/null +++ b/api-admin/src/main/resources/jaspers/isn_print_1.jrxml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band splitType="Stretch"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jasper b/api-admin/src/main/resources/jaspers/order_print_1.jasper new file mode 100644 index 0000000..dff81ea Binary files /dev/null and b/api-admin/src/main/resources/jaspers/order_print_1.jasper differ diff --git a/api-admin/src/main/resources/jaspers/order_print_1.jrxml b/api-admin/src/main/resources/jaspers/order_print_1.jrxml new file mode 100644 index 0000000..14a69d0 --- /dev/null +++ b/api-admin/src/main/resources/jaspers/order_print_1.jrxml @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="98" splitType="Stretch"> + <textField isBlankWhenNull="true"> + <reportElement x="40" y="8" width="504" height="30" uuid="792264b3-8a9c-42fe-ba28-ffc580771931"/> + <textElement textAlignment="Center" verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{title}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="0" y="47" width="50" height="24" uuid="5ba70caa-24aa-45b4-996c-46c1e4500475"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font fontName="华文宋体"/> + </textElement> + <text><![CDATA[单号:]]></text> + </staticText> + <textField isBlankWhenNull="true"> + <reportElement x="56" y="47" width="124" height="24" uuid="92a15708-763f-496c-ab77-55130f8f4e1c"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{billNo}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="401" y="70" width="50" height="24" uuid="198d781d-8f0d-4b91-9eb9-eb845e506d3b"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font fontName="华文宋体"/> + </textElement> + <text><![CDATA[开单日期:]]></text> + </staticText> + <textField isBlankWhenNull="true"> + <reportElement x="459" y="70" width="100" height="24" uuid="006f1842-d859-4f94-84be-6601ad8f972a"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{billDate}]]></textFieldExpression> + </textField> + <staticText> + <reportElement x="-8" y="72" width="58" height="24" uuid="3b263493-0ad2-4c4f-b101-18781d92378f"/> + <textElement textAlignment="Right" verticalAlignment="Middle"> + <font fontName="华文宋体"/> + </textElement> + <text><![CDATA[送货单位:]]></text> + </staticText> + <textField isBlankWhenNull="true"> + <reportElement x="56" y="72" width="337" height="24" uuid="c7ff1896-1c78-44fd-a795-7005efd9e190"/> + <textElement verticalAlignment="Middle"/> + <textFieldExpression><![CDATA[$F{corpName}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/api-admin/src/main/resources/logback-spring.xml b/api-admin/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..8a2b724 --- /dev/null +++ b/api-admin/src/main/resources/logback-spring.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + UTF-8 + + + + + + + ERROR + DENY + ACCEPT + + + + d:/1s/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log + + 30 + + + 64 MB + + + + %d{yyyy-MM-dd HH:mm:ss:SSS} %-5level [%thread] %logger{50}-%L %msg%n + + + + + + ERROR + + + + d:/1s/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log + + 30 + + + 64 MB + + + + %d{yyyy-MM-dd HH:mm:ss:SSS} %-5level [%thread] %logger{50}-%L %msg%n + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/configuration.xml b/api-admin/src/main/resources/mybatis/configuration.xml new file mode 100644 index 0000000..cc95ac8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/configuration.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/db.properties b/api-admin/src/main/resources/mybatis/db.properties new file mode 100644 index 0000000..8caaaaf --- /dev/null +++ b/api-admin/src/main/resources/mybatis/db.properties @@ -0,0 +1,5 @@ +jdbc.jar.path=D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar +jdbc.driver=com.mysql.cj.jdbc.Driver +jdbc.url=jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false +jdbc.username=root +jdbc.password=123456 \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml new file mode 100644 index 0000000..4b2e9d2 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId) + values + (#{userName}, + + + #{passWord}, + + + '', + + + + + + + #{lastLoginIp}, + + + '', + + + + + #{lastLoginTime}, + + + '0001-01-01 00:00:00', + + + #{createTime}, + #{userFlag,jdbcType=INTEGER}, + #{employeeName}, + #{CustomerId}) + + + + UPDATE auth_user + + userName=#{userName}, + passWord=#{passWord}, + lastLoginIp=#{lastLoginIp}, + lastLoginTime=#{lastLoginTime}, + userFlag=#{userFlag}, + employeeName=#{employeeName} + + WHERE id=#{id} + + + + delete + from auth_user + where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml new file mode 100644 index 0000000..1ad1f69 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + INSERT INTO auth_permission + (roleId, permissionRuleId,`type`) + VALUES + + + (#{item.roleId}, #{item.permissionRuleId}, #{item.type}) + + + + + + + delete from auth_permission where roleId = #{roleId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml new file mode 100644 index 0000000..0868080 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + INSERT INTO auth_permission_rule(pid,`name`,`title`,`status`,`condition`,`listorder`,create_time,update_time) + values + (#{pid}, + #{name}, + #{title}, + #{status}, + + + #{condition}, + + + '', + + + #{listorder}, + #{createTime}, + #{updateTime}) + + + + UPDATE auth_permission_rule + + pid=#{pid}, + `name`=#{name}, + title=#{title}, + `status`=#{status}, + `condition`=#{condition}, + `listorder`=#{listorder}, + update_time=#{updateTime}, + + WHERE id=#{id} + + + + delete from auth_permission_rule where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml new file mode 100644 index 0000000..d59da81 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + INSERT INTO auth_role_admin + (role_id, admin_id) + VALUES + + + (#{item.role_id}, #{item.admin_id}) + + + + + + delete from auth_role_admin where admin_id = #{adminId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml new file mode 100644 index 0000000..07d425b --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + INSERT INTO auth_role(`name`,pid,`status`,`remark`,`listorder`,create_time,update_time,isCustomer) + values + ( + #{name}, + + + #{pid}, + + + 0, + + + #{status}, + + + #{remark}, + + + '', + + + + + #{listorder}, + + + 999, + + + #{createTime}, + #{updateTime}, + #{isCustomer} + ) + + + + UPDATE auth_role + + `name`=#{name}, + pid=#{pid}, + `status`=#{status}, + remark=#{remark}, + `listorder`=#{listorder}, + update_time=#{updateTime}, + isCustomer=#{isCustomer}, + + WHERE id=#{id} + + + + delete from auth_role where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml new file mode 100644 index 0000000..d8e3932 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml @@ -0,0 +1,63 @@ + + + + + + + + + + INSERT INTO customer_contact + ( + customerId, contacts, + mobile, tel, email, + comments + ) + values + ( + #{customerId},#{contacts}, + #{mobile},#{tel},#{email}, + #{comments} + ) + + + + UPDATE customer_contact + + + contacts=#{contacts}, + mobile=#{mobile}, + tel=#{tel}, + email=#{email}, + comments=#{comments}, + + WHERE customerId=#{customerId} + + + + delete from customer_contact where customerId = #{customerId} + + + delete from customer_contact where customerId = #{customerId} + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml new file mode 100644 index 0000000..86873cf --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + INSERT INTO customer_info + ( + customerId, customerName, creditNum, + area, detailAddr, bussinessStatus, + userFlag, isInfoLink, infoLink, + roleId, comments,userMax,companyName + ) + values + ( + #{customerId},#{customerName},#{creditNum}, + #{area},#{detailAddr},#{bussinessStatus}, + #{userFlag},#{isInfoLink},#{infoLink}, + #{roleId}, + #{comments}, + #{userMax},#{companyName} + ) + + + + UPDATE customer_info + + customerName=#{customerName}, + creditNum=#{creditNum}, + `area`=#{area}, + detailAddr=#{detailAddr}, + `bussinessStatus`=#{bussinessStatus}, + userFlag=#{userFlag}, + isInfoLink=#{isInfoLink}, + infoLink=#{infoLink}, + roleId=#{roleId}, + userMax=#{userMax}, + companyName=#{companyName}, + + WHERE customerId=#{customerId} + + + + + + + delete from customer_info where customerId = #{customerId} + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml new file mode 100644 index 0000000..e1dc71d --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -0,0 +1,104 @@ + + + + + + + + + + INSERT INTO user_register + ( + nickName, password, realName, + tel, mobile, userId, + email, companyName, creditNum, + area, detailAddr, bussinessStatus, + checkType, registerTime, checkTime,comments,areaCode,userName,licenseUrl,companyId + ) + values + ( + #{nickName},#{password},#{realName}, + #{tel},#{mobile},#{userId}, + #{email},#{companyName},#{creditNum}, + #{area},#{detailAddr},#{bussinessStatus}, + #{checkType},#{registerTime},#{checkTime}, + #{comments},#{areaCode},#{userName},#{licenseUrl},#{companyId} + ) + + + + UPDATE user_register + + `nickName`=#{nickName}, + password=#{password}, + `realName`=#{realName}, + tel=#{tel}, + `mobile`=#{mobile}, + userId=#{userId}, + email=#{email}, + companyName=#{companyName}, + creditNum=#{creditNum}, + area=#{area}, + detailAddr=#{detailAddr}, + bussinessStatus=#{bussinessStatus}, + checkType=#{checkType}, + registerTime=#{registerTime}, + checkTime=#{checkTime}, + areaCode=#{areaCode}, + userName=#{userName}, + licenseUrl=#{licenseUrl}, + companyId=#{companyId}, + + WHERE id=#{id} + + + + delete from user_register where id = #{id} + + + + delete from user_register where userId = #{userId} + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/AliCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/AliCertDao.xml new file mode 100644 index 0000000..720c393 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/AliCertDao.xml @@ -0,0 +1,59 @@ + + + + + + + + replace INTO alicert + (appKey,appSecret,companyName,aliUser,aliPasswd) + values + ( + #{appKey}, + #{appSecret}, + #{companyName}, + #{aliUser}, + #{aliPasswd} + ) + + + + + replace INTO alicert + (appKey,appSecret,companyName,aliUser,aliPasswd) + VALUES + + ( + #{item.appKey}, + #{item.appSecret}, + #{item.companyName}, + #{item.aliUser}, + #{item.aliPasswd} + ) + + + + + + delete from alicert where id = #{id} + + + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ApilogDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/ApilogDao.xml new file mode 100644 index 0000000..f63861f --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/ApilogDao.xml @@ -0,0 +1,140 @@ + + + + + + + + insert INTO api_log + (customerId,lsyd_uploadretail,lsyd_uploadinoutbill,lsyd_query_billstatus, + lsyd_query_upbillcode,lsyd_query_upbilldetail,lsyd_query_relation, + lsyd_query_codedetail,lsyd_query_getentinfo,lsyd_listupout,lsyd_listupout_detail, + kyt_uploadcircubill,kyt_searchstatus,kyt_getbyentid,kyt_getbyrefentid,kyt_listparts, + kyt_synonymauths,kyt_drugtable,kyt_listupout,kyt_uploadrelation,kyt_uploadinoutbill, + kyt_singlerelation,kyt_codeprocess,bill_upbill_detail_withcode,kyt_getentinfo, + kyt_searchbill,kyt_querycodeactive,kyt_querycode,kyt_listparts_byagent,kyt_drugrescode,kyt_remnantbill_upload) + values + ( + #{customerId}, +#{lsyd_uploadretail}, +#{lsyd_uploadinoutbill}, +#{lsyd_query_billstatus}, +#{lsyd_query_upbillcode}, +#{lsyd_query_upbilldetail}, +#{lsyd_query_relation}, +#{lsyd_query_codedetail}, +#{lsyd_query_getentinfo}, +#{lsyd_listupout}, +#{lsyd_listupout_detail}, +#{kyt_uploadcircubill}, +#{kyt_searchstatus}, +#{kyt_getbyentid}, +#{kyt_getbyrefentid}, +#{kyt_listparts}, +#{kyt_synonymauths}, +#{kyt_drugtable}, +#{kyt_listupout}, +#{kyt_uploadrelation}, +#{kyt_uploadinoutbill}, +#{kyt_singlerelation}, +#{kyt_codeprocess}, +#{bill_upbill_detail_withcode}, +#{kyt_getentinfo}, +#{kyt_searchbill}, +#{kyt_querycodeactive}, +#{kyt_querycode}, +#{kyt_listparts_byagent}, +#{kyt_drugrescode}, +#{kyt_remnantbill_upload} + ) + + + + + + + delete from api_log where id = #{id} + + + + + + UPDATE api_log + + lsyd_uploadretail=#{lsyd_uploadretail}, + lsyd_uploadinoutbill=#{lsyd_uploadinoutbill}, + lsyd_query_billstatus=#{lsyd_query_billstatus}, + lsyd_query_upbillcode=#{lsyd_query_upbillcode}, + lsyd_query_upbilldetail=#{lsyd_query_upbilldetail}, + lsyd_query_relation=#{lsyd_query_relation}, + lsyd_query_codedetail=#{lsyd_query_codedetail}, + lsyd_query_getentinfo=#{lsyd_query_getentinfo}, + lsyd_listupout=#{lsyd_listupout}, + lsyd_listupout_detail=#{lsyd_listupout_detail}, + kyt_uploadcircubill=#{kyt_uploadcircubill}, + kyt_searchstatus=#{kyt_searchstatus}, + kyt_getbyentid=#{kyt_getbyentid}, + kyt_getbyrefentid=#{kyt_getbyrefentid}, + kyt_listparts=#{kyt_listparts}, + kyt_synonymauths=#{kyt_synonymauths}, + kyt_drugtable=#{kyt_drugtable}, + kyt_listupout=#{kyt_listupout}, + kyt_uploadrelation=#{kyt_uploadrelation}, + kyt_uploadinoutbill=#{kyt_uploadinoutbill}, + kyt_singlerelation=#{kyt_singlerelation}, + kyt_codeprocess=#{kyt_codeprocess}, + bill_upbill_detail_withcode=#{bill_upbill_detail_withcode}, + kyt_getentinfo=#{kyt_getentinfo}, + kyt_searchbill=#{kyt_searchbill}, + kyt_querycodeactive=#{kyt_querycodeactive}, + kyt_querycode=#{kyt_querycode}, + kyt_listparts_byagent=#{kyt_listparts_byagent}, + kyt_drugrescode=#{kyt_drugrescode}, + kyt_remnantbill_upload=#{kyt_remnantbill_upload}, + + + WHERE customerId=#{customerId} + + + + + UPDATE api_log + + lsyd_uploadretail=lsyd_uploadretail+1, + lsyd_uploadinoutbill=lsyd_uploadinoutbill+1, + lsyd_query_billstatus=lsyd_query_billstatus+1, + lsyd_query_upbillcode=lsyd_query_upbillcode+1, + lsyd_query_upbilldetail=lsyd_query_upbilldetail+1, + lsyd_query_relation=lsyd_query_relation+1, + lsyd_query_codedetail=lsyd_query_codedetail+1, + lsyd_query_getentinfo=lsyd_query_getentinfo+1, + lsyd_listupout=lsyd_listupout+1, + lsyd_listupout_detail=lsyd_listupout_detail+1, + kyt_uploadcircubill=kyt_uploadcircubill+1, + kyt_searchstatus=kyt_searchstatus+1, + kyt_getbyentid=kyt_getbyentid+1, + kyt_getbyrefentid=kyt_getbyrefentid+1, + kyt_listparts=kyt_listparts+1, + kyt_synonymauths=kyt_synonymauths+1, + kyt_drugtable=kyt_drugtable+1, + kyt_listupout=kyt_listupout+1, + kyt_uploadrelation=kyt_uploadrelation+1, + kyt_uploadinoutbill=kyt_uploadinoutbill+1, + kyt_singlerelation=kyt_singlerelation+1, + kyt_codeprocess=kyt_codeprocess+1, + bill_upbill_detail_withcode=bill_upbill_detail_withcode+1, + kyt_getentinfo=kyt_getentinfo+1, + kyt_searchbill=kyt_searchbill+1, + kyt_querycodeactive=kyt_querycodeactive+1, + kyt_querycode=kyt_querycode+1, + kyt_listparts_byagent=kyt_listparts_byagent+1, + kyt_drugrescode=kyt_drugrescode+1, + kyt_remnantbill_upload=kyt_remnantbill_upload+1, + + + WHERE customerId=#{customerId} + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml new file mode 100644 index 0000000..cb466b7 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyCertDao.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + UPDATE company_cert + + name=#{name}, + customerId=#{customerId}, + filePath=#{filePath}, + remark=#{remark}, + create_time=#{create_time}, + update_time=#{update_time}, + + WHERE id = #{id} + + + + INSERT INTO company_cert(name,customerId,filePath,remark,create_time,update_time) values + ( #{name}, + #{customerId}, + #{filePath}, + #{remark}, + #{create_time}, + #{update_time}) + + + + DELETE + FROM company_cert + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml new file mode 100644 index 0000000..e8070dd --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + UPDATE company + + companyName=#{companyName}, + bussinessStatus=#{bussinessStatus}, + creditNum=#{creditNum}, + classes=#{classes}, + area=#{area}, + detailAddr=#{detailAddr}, + appId=#{appId}, + appSecret=#{appSecret}, + contacts=#{contacts}, + mobile=#{mobile}, + tel=#{tel}, + email=#{email}, + refEntId=#{refEntId}, + entId=#{entId}, + networkType=#{networkType}, + certIdFk=#{certIdFk}, + areaCode=#{areaCode}, + parentCompany=#{parentCompany}, + parentIdFk=#{parentIdFk}, + contactsPapersType=#{contactsPapersType}, + contactsPapersCode=#{contactsPapersCode}, + registerStatus=#{registerStatus}, + jyxkzh=#{jyxkzh}, + jyxkzfzjg=#{jyxkzfzjg}, + jyxkzyxq=#{jyxkzyxq}, + jybapzh=#{jybapzh}, + jybabm=#{jybabm}, + fzrq=#{fzrq}, + suihao=#{suihao}, + kaihuhang=#{kaihuhang}, + kaihuzhanghao=#{kaihuzhanghao}, + auditStatus=#{auditStatus}, + filePath=#{filePath}, + filePath2=#{filePath2}, + filePath3=#{filePath3}, + filePath4=#{filePath4}, + unitIdFk=#{unitIdFk}, + + WHERE customerId=#{customerId} + + + + + + INSERT INTO company(companyName,bussinessStatus,creditNum,classes,area, + detailAddr,appId,appSecret,contacts,mobile,tel,email,customerId,areaCode, + refEntId,entId,networkType,certIdFk,parentCompany,parentIdFk, + contactsPapersType,contactsPapersCode,registerStatus,jyxkzh,jyxkzfzjg,jyxkzyxq, + jybapzh,jybabm,fzrq,suihao,kaihuhang,kaihuzhanghao,auditStatus, + filePath,filePath2,filePath3,filePath4,unitIdFk) values + ( #{companyName}, + #{bussinessStatus}, + #{creditNum}, + #{classes}, + #{area}, + #{detailAddr}, + #{appId}, + #{appSecret}, + #{contacts}, + #{mobile}, + #{tel}, + #{email}, + #{customerId}, + #{areaCode}, + #{refEntId}, + #{entId}, + #{networkType}, + #{certIdFk}, + #{parentCompany}, + #{parentIdFk}, + #{contactsPapersType}, + #{contactsPapersCode}, + #{registerStatus}, + #{jyxkzh}, + #{jyxkzfzjg}, + #{jyxkzyxq}, + #{jybapzh}, + #{jybabm}, + #{fzrq}, + #{suihao}, + #{kaihuhang}, + #{kaihuzhanghao}, + #{auditStatus}, + #{filePath}, + #{filePath2}, + #{filePath3}, + #{filePath4},#{unitIdFk} + ) + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanySalesmanDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanySalesmanDao.xml new file mode 100644 index 0000000..0bb99dc --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanySalesmanDao.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + UPDATE company_salesman + + customerId=#{customerId}, + name=#{name}, + tel=#{tel}, + phone=#{phone}, + email=#{email}, + certType=#{certType}, + certCode=#{certCode}, + filePath=#{filePath}, + filePath2=#{filePath2}, + create_time=#{create_time}, + update_time=#{update_time}, + auditStatus=#{auditStatus}, + + WHERE id = #{id} + + + + INSERT INTO company_salesman(customerId,name,tel,phone,email,certType,certCode,filePath,filePath2,create_time,update_time, + auditStatus) values + ( + #{customerId}, + #{name}, + #{tel}, + #{phone}, + #{email}, + #{certType}, + #{certCode}, + #{filePath}, + #{filePath2}, + #{create_time}, + #{update_time}, + #{auditStatus} + ) + + + + DELETE + FROM company_salesman + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanySalesmanUpdateLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanySalesmanUpdateLogDao.xml new file mode 100644 index 0000000..429add6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanySalesmanUpdateLogDao.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + UPDATE company_salesman_update_log + + customerId=#{customerId}, + updateCause=#{updateCause}, + status=#{status}, + create_time=#{create_time}, + update_time=#{update_time}, + submit=#{submit}, + auditor=#{auditor}, + noPassCause=#{noPassCause}, + param=#{param}, + salesmanId=#{salesmanId}, + + WHERE id = #{id} + + + + INSERT INTO company_salesman_update_log(customerId,updateCause,status,create_time,update_time, + submit,auditor,noPassCause,param,salesmanId) values + ( + #{customerId}, + #{updateCause}, + #{status}, + #{create_time}, + #{update_time}, + #{submit}, + #{auditor}, + #{noPassCause}, + #{param}, + #{salesmanId} + ) + + + + DELETE + FROM company_salesman_update_log + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyUpdateLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyUpdateLogDao.xml new file mode 100644 index 0000000..d9ce4a6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyUpdateLogDao.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + UPDATE company_update_log + + customerId=#{customerId}, + updateCause=#{updateCause}, + status=#{status}, + create_time=#{create_time}, + update_time=#{update_time}, + submit=#{submit}, + auditor=#{auditor}, + noPassCause=#{noPassCause}, + param=#{param}, + logType=#{logType}, + + WHERE id = #{id} + + + + INSERT INTO company_update_log(customerId,updateCause,status,create_time,update_time, + submit,auditor,noPassCause,param,logType) values + ( + #{customerId}, + #{updateCause}, + #{status}, + #{create_time}, + #{update_time}, + #{submit}, + #{auditor}, + #{noPassCause}, + #{param}, + #{logType} + ) + + + + DELETE + FROM company_update_log + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/DeviceKeyDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/DeviceKeyDao.xml new file mode 100644 index 0000000..7f3bfac --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/DeviceKeyDao.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + UPDATE device_check + + isCheck=#{isCheck}, + companyName=#{companyName}, + phone=#{phone}, + contact=#{contact}, + imeiKey=#{imeiKey}, + date=#{date}, + + WHERE id=#{id} + + + + + + UPDATE device_check + + isCheck=#{isCheck}, + companyName=#{companyName}, + phone=#{phone}, + contact=#{contact}, + imeiKey=#{imeiKey}, + date=#{date}, + imei=#{imei}, + + WHERE imei=#{imei} + + + + INSERT INTO device_check( + imei, + isCheck, + companyName, + phone, + contact, + date, + imeiKey) values + ( + #{imei}, + #{isCheck}, + #{companyName}, + #{phone}, + #{contact}, + #{date}, + #{imeiKey} + + ) + + + DELETE FROM device_check WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml new file mode 100644 index 0000000..bb8fb96 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml @@ -0,0 +1,40 @@ + + + + + + + + insert INTO scheduled + (cronName,cron,customerId) + values + ( + #{cronName}, + #{cron}, + #{customerId} + ) + + + + + delete from scheduled where id = #{id} + + + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml new file mode 100644 index 0000000..6c2faa8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + UPDATE customer_set + + checkUpbill=#{checkUpbill}, + checkStock=#{checkStock}, + checkRepeat=#{checkRepeat}, + downloadRelation=#{downloadRelation}, + uploadTime=#{uploadTime}, + lastUploadDate=#{lastUploadDate}, + + WHERE customerId=#{customerId} + + + + + + replace INTO customer_set(customerId, + checkUpbill,checkStock,checkRepeat,downloadRelation,uploadTime,lastUploadDate) values + ( + #{customerId}, + #{checkUpbill}, #{checkStock} , #{checkRepeat}, #{downloadRelation} + ,#{uploadTime},#{lastUploadDate}) + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SuppliersEnterpriseBasic.xml b/api-admin/src/main/resources/mybatis/mapper/info/SuppliersEnterpriseBasic.xml new file mode 100644 index 0000000..2fb3af4 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SuppliersEnterpriseBasic.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + UPDATE suppliers_enterprise_basic + + companyName=#{companyName}, + creditCode=#{creditCode}, + companyType=#{companyType}, + placeArea=#{placeArea}, + placeAreaCode=#{placeAreaCode}, + placeAddress=#{placeAddress}, + legalPersonName=#{legalPersonName}, + legalPersonPapersType=#{legalPersonPapersType}, + legalPersonPapersCode=#{legalPersonPapersCode}, + productionArea=#{productionArea}, + productionAreaCode=#{productionAreaCode}, + productionAddress=#{productionAddress}, + registerStatus=#{registerStatus}, + productionLicenceNum=#{productionLicenceNum}, + productionLicenceDate=#{productionLicenceDate}, + productionRecordNum=#{productionRecordNum}, + productionRecordSection=#{productionRecordSection}, + productionRecordDate=#{productionRecordDate}, + remark=#{remark}, + create_date=#{createDate}, + update_date=#{updateDate}, + + WHERE id=#{id} + + + + + INSERT INTO suppliers_enterprise_basic( + companyName,creditCode,companyType, + placeArea,placeAreaCode,placeAddress, + legalPersonName,legalPersonPapersType,legalPersonPapersCode, + productionArea,productionAreaCode,productionAddress, + registerStatus,productionLicenceNum,productionLicenceDate, + productionRecordNum,productionRecordSection,productionRecordDate, + remark,create_date,update_date + ) values + ( + #{companyName},#{creditCode},#{companyType}, + #{placeArea},#{placeAreaCode},#{placeAddress}, + #{legalPersonName},#{legalPersonPapersType},#{legalPersonPapersCode}, + #{productionArea},#{productionAreaCode},#{productionAddress}, + #{registerStatus},#{productionLicenceNum},#{productionLicenceDate}, + #{productionRecordNum},#{productionRecordSection},#{productionRecordDate}, + #{remark},#{createDate},#{updateDate} + ) + + + + DELETE + FROM suppliers_enterprise_basic + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SuppliersEnterpriseBasicCert.xml b/api-admin/src/main/resources/mybatis/mapper/info/SuppliersEnterpriseBasicCert.xml new file mode 100644 index 0000000..7aa2232 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SuppliersEnterpriseBasicCert.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + UPDATE suppliers_enterprise_basic_cert + + name=#{name}, + enterpriseId=#{enterpriseId}, + filePath=#{filePath}, + remark=#{remark}, + create_time=#{create_time}, + update_time=#{update_time}, + + WHERE id = #{id} + + + + INSERT INTO suppliers_enterprise_basic_cert(name,enterpriseId,filePath,remark,create_time,update_time) values + ( #{name}, + #{enterpriseId}, + #{filePath}, + #{remark}, + #{create_time}, + #{update_time}) + + + + DELETE + FROM suppliers_enterprise_basic_cert + WHERE id = #{id} + + + + DELETE + FROM suppliers_enterprise_basic_cert + WHERE enterpriseId = #{enterpriseId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SuppliersRegistrationBasic.xml b/api-admin/src/main/resources/mybatis/mapper/info/SuppliersRegistrationBasic.xml new file mode 100644 index 0000000..740c7ff --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SuppliersRegistrationBasic.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + UPDATE suppliers_registration_basic + + enterpriseId=#{enterpriseId}, + recordCode=#{recordCode}, + recordProductName=#{recordProductName}, + productManageType=#{productManageType}, + recordPeopleName=#{recordPeopleName}, + recordPeopleArea=#{recordPeopleArea}, + recordPeopleAreaCode=#{recordPeopleAreaCode}, + recordPeopleAddress=#{recordPeopleAddress}, + productType=#{productType}, + productDirectoryCode=#{productDirectoryCode}, + agentName=#{agentName}, + agentArea=#{agentArea}, + agentAreaCode=#{agentAreaCode}, + agentAddress=#{agentAddress}, + instructions=#{instructions}, + productAddress=#{productAddress}, + recordText=#{recordText}, + placeOrigin=#{placeOrigin}, + productionRegion=#{productionRegion}, + productionCompanyName=#{productionCompanyName}, + afterSale=#{afterSale}, + specification=#{specification}, + structure=#{structure}, + scope=#{scope}, + other=#{other}, + filePath=#{filePath}, + remark=#{remark}, + create_date=#{create_date}, + update_date=#{update_date}, + + WHERE id=#{id} + + + + + INSERT INTO suppliers_registration_basic( + enterpriseId,recordCode,recordProductName, + productManageType,recordPeopleName,recordPeopleArea, + recordPeopleAreaCode,recordPeopleAddress,productType, + productDirectoryCode,agentName,agentArea, + agentAreaCode,agentAddress,instructions, + productAddress,recordText,placeOrigin, + productionRegion,productionCompanyName,afterSale, + specification,structure,scope, + other,filePath,remark, + create_date,update_date + ) values + ( + #{enterpriseId},#{recordCode},#{recordProductName}, + #{productManageType},#{recordPeopleName},#{recordPeopleArea}, + #{recordPeopleAreaCode},#{recordPeopleAddress},#{productType}, + #{productDirectoryCode},#{agentName},#{agentArea}, + #{agentAreaCode},#{agentAddress},#{instructions}, + #{productAddress},#{recordText},#{placeOrigin}, + #{productionRegion},#{productionCompanyName},#{afterSale}, + #{specification},#{structure},#{scope}, + #{other},#{filePath},#{remark}, + #{create_date},#{update_date} + ) + + + + DELETE + FROM suppliers_registration_basic + WHERE id = #{id} + + + + DELETE + FROM suppliers_registration_basic + WHERE enterpriseId = #{enterpriseId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml new file mode 100644 index 0000000..b3ab279 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + UPDATE system_param_config + + paramName=#{paramName}, + paramKey=#{paramKey}, + paramValue=#{paramValue}, + paramStatus=#{paramStatus}, + paramType=#{paramType}, + paramExplain=#{paramExplain}, + + WHERE id=#{id} + + + + UPDATE system_param_config + + paramStatus=#{paramStatus}, + + WHERE parentId=#{parentId} + + + + insert INTO system_param_config(paramName, + paramKey,paramValue,paramStatus,paramType,paramExplain + ) values + ( + #{paramName}, + #{paramKey}, + #{paramValue}, + #{paramStatus}, + #{paramType}, + #{paramExplain} + ) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/CodesDao.xml new file mode 100644 index 0000000..892edcd --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/CodesDao.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + INSERT INTO io_codes(action, mainAction, code, corpOrderId, actor, actDate, + fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, + serialNo, count, packageLevel, warehouseCode, nameCode, supId, relId, status) + values (#{action}, + #{mainAction}, + #{code}, + #{corpOrderId}, + #{actor}, + #{actDate}, + #{fromCorpId}, + #{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count}, + #{packageLevel}, #{warehouseCode}, + #{nameCode}, #{supId}, #{relId}, #{status}) + + + + INSERT INTO io_codes + (action, + mainAction, + code, + corpOrderId, + actor, + actDate, + fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate, + serialNo,count,packageLevel,warehouseCode,nameCode,supId, relId,status) + VALUES + + ( + #{item.action}, + #{item.mainAction}, + #{item.code}, + #{item.corpOrderId}, + #{item.actor}, + #{item.actDate}, + #{item.fromCorpId}, + #{ + item.fromCorp + },#{item.orderId},#{item.batchNo} + ,#{item.produceDate} + ,#{item.expireDate} + ,#{item.serialNo} + ,#{item.count} + ,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId} + ,#{item.relId},#{item.status}) + + + + + + + + + + + UPDATE io_codes + SET orderId = #{newOrderId} + where orderId = #{oldOrderId} + + + + + UPDATE io_codes + SET fromCorpId = #{fromCorpId}, + fromCorp = #{fromCorp} + WHERE orderId = #{orderId} + + + + UPDATE io_codes + SET relId = #{relId} + where nameCode = #{nameCode} + and orderId = #{orderId} + + + + + UPDATE io_codes + SET supId = #{supId} + where nameCode = #{nameCode} + and orderId = #{orderId} + + + + DELETE + FROM io_codes + WHERE orderId = #{orderId} + + + UPDATE io_codes + + relId=#{relId}, + fromCorp=#{fromCorp}, + fromCorpId=#{fromCorpId}, + count=#{count}, + status=#{status}, + supId=#{supId}, + + WHERE id=#{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/CorpImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/CorpImportDetailDao.xml new file mode 100644 index 0000000..ecf969e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/CorpImportDetailDao.xml @@ -0,0 +1,113 @@ + + + + + + + + + + insert INTO basic_corps_import_detail + ( + thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4, + importStatus,updateTime,remark,genKeyFk) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile},#{thirdId1},#{thirdId2},#{thirdId3},#{thirdId4}, + #{thirdName},#{thirdName1},#{thirdName2},#{thirdName3},#{thirdName4}, + #{importStatus}, + #{updateTime},#{remark}, #{genKeyFk} + ) + + + + insert INTO basic_corps_import_detail + ( + thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4, + importStatus,updateTime,remark,genKeyFk) + values + + ( + #{item.thirdId}, + #{item.erpId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.status}, + #{item.type}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile},#{item.thirdId1},#{item.thirdId2},#{item.thirdId3},#{item.thirdId4}, + #{item.thirdName},#{item.thirdName1},#{item.thirdName2},#{item.thirdName3},#{item.thirdName4}, + #{item.importStatus}, + #{item.updateTime},#{item.remark}, #{item.genKeyFk} + ) + + + + DELETE FROM basic_corps_import_detail WHERE id = #{id} + + + DELETE FROM basic_corps_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE basic_corps_import_detail + + thirdId=#{thirdId}, + erpId=#{erpId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + thirdName=#{thirdName}, + thirdName1=#{thirdName1}, + thirdName2=#{thirdName2}, + thirdName3=#{thirdName3}, + thirdName4=#{thirdName4}, + importStatus=#{importStatus}, + updateTime=#{updateTime}, + remark=#{remark}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/CorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/CorpImportLogDao.xml new file mode 100644 index 0000000..f53d898 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/CorpImportLogDao.xml @@ -0,0 +1,53 @@ + + + + + + + + + + insert INTO basic_corps_import_log + (genKey,fromType,updateTime,remark,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{remark},#{status} + ) + + + + + DELETE FROM basic_corps_import_log WHERE id = #{id} + + + + UPDATE basic_corps_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/IOOrderStatusDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/IOOrderStatusDao.xml new file mode 100644 index 0000000..f687ab4 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/IOOrderStatusDao.xml @@ -0,0 +1,44 @@ + + + + + + + + + + replace + INTO io_order_status(orderId,status,updateTime) + values( + #{orderId}, + #{status}, + #{updateTime} + ) + + + + UPDATE io_order_status + + status=#{status}, + updateTime=#{updateTime}, + + WHERE orderId = #{orderId} + + + DELETE + FROM io_order_status + WHERE orderId = #{orderId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/OrderDao.xml new file mode 100644 index 0000000..dd4b3be --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/OrderDao.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, + fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, + receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath) + values (#{id}, + #{action}, + #{corpOrderId}, + #{actDate}, + #{fromCorpId}, + #{actor}, + #{mainAction}, + #{fromCorp}, + #{status}, + #{remark}, + #{exportStatus}, + #{fromType}, + #{contrastStatus}, + #{signStatus}, + #{receiveStatus}, + #{erpFk}, + #{stockCheckFk}, + #{customerId}, #{supId}, #{exportFilePath}) + + + UPDATE io_order + + action=#{action}, + corpOrderId=#{corpOrderId}, + actDate=#{actDate}, + fromCorpId=#{fromCorpId}, + actor=#{actor}, + mainAction=#{mainAction}, + fromCorp=#{fromCorp}, + status=#{status}, + remark=#{remark}, + exportStatus=#{exportStatus}, + fromType=#{fromType}, + contrastStatus=#{contrastStatus}, + erpFk=#{erpFk}, + signStatus=#{signStatus}, + receiveStatus=#{receiveStatus}, + stockCheckFk=#{stockCheckFk}, + supId=#{supId}, + exportFilePath=#{exportFilePath}, + + WHERE id = #{id} + + + + + + DELETE + FROM io_order + WHERE id = #{id} + + + + + DELETE + FROM io_order + WHERE id = #{orderId} + + + + UPDATE io_order + SET fromCorpId = #{fromCorpId}, + fromCorp = #{fromCorp} + where id = #{id} + + + + UPDATE io_order + SET `status` = #{status} + where id = #{orderId} + + + UPDATE io_order + SET `exportStatus` = #{exportStatus} + where id = #{orderId} + + + UPDATE io_order + SET `contrastStatus` = #{contrastStatus} + where id = #{orderId} + + + UPDATE io_order + SET `signStatus` = #{signStatus} + where id = #{orderId} + + + UPDATE io_order + SET `remark` = #{remark} + where id = #{orderId} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/OrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/OrderDetailDao.xml new file mode 100644 index 0000000..fde5ef3 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/OrderDetailDao.xml @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + replace + INTO io_order_detail(id, + companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid, + batchNoId,goodsname,companyname, + batchNo,erpCount,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl, + zxxsbzbhsydysl,orderIdFk,count,reCount,productDate,expireDate,bindStatus,bindRlFk,uuidFk,supId,bindSupStatus) + values( + #{id}, + #{companyid}, + #{erpOrderId}, + #{iodtlId}, + #{inoutId}, + #{goodsunit}, + #{goodsid}, + #{batchNoId}, + #{goodsname}, + #{companyname}, + #{batchNo}, + #{erpCount}, + #{credate}, + #{nameCode}, + #{productCompany}, + #{coName}, + #{authCode}, + #{packSpec}, + #{packRatio}, + #{bhzxxsbzsl}, + #{zxxsbzbhsydysl}, + #{orderIdFk}, + #{count}, + #{reCount}, + #{productDate}, + #{expireDate} + , + #{bindStatus}, + #{bindRlFk}, + #{uuidFk}, + #{supId},#{bindSupStatus} + ) + + + + replace INTO io_order_detail(id, + companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid,batchNoId,goodsname,companyname, + batchNo,erpCount,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount,productDate,expireDate + ,bindStatus,bindRlFk,uuidFk,supId,bindSupStatus) + values + + + ( + #{item.id}, + #{item.companyid}, + #{item.erpOrderId}, + #{item.iodtlId}, + #{item.inoutId}, + #{item.goodsunit}, + #{item.goodsid}, + #{item.batchNoId}, + #{item.goodsname}, + #{item.companyname}, + #{item.batchNo}, + #{item.erpCount}, #{item.credate}, + #{item.nameCode}, #{item.productCompany}, #{item.coName}, #{item.authCode}, #{item.packSpec}, + #{item.packRatio}, #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, #{item.orderIdFk}, + #{item.count},#{item.reCount},#{item.productDate},#{item.expireDate}, + #{item.bindStatus}, #{item.bindRlFk},#{item.uuidFk},#{item.supId},#{item.bindSupStatus} + ) + + + + + UPDATE io_order_detail + + goodsid=#{goodsid}, + goodsname=#{goodsname}, + bindStatus=#{bindStatus}, + bindRlFk=#{bindRlFk}, + count=#{count}, + reCount=#{reCount}, + erpCount=#{erpCount}, + uuidFk=#{uuidFk}, + erpOrderId=#{erpOrderId}, + erpOrderId=#{erpOrderId}, + supId=#{supId}, + bindSupStatus=#{bindSupStatus}, + + + WHERE id = #{id} + + + DELETE + FROM io_order_detail + WHERE erpOrderId = #{id} + + + + DELETE + FROM io_order_detail + WHERE id = #{id} + + + + DELETE + FROM io_order_detail + WHERE orderIdFk = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/ThrImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/ThrImportLogDao.xml new file mode 100644 index 0000000..ced9618 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/ThrImportLogDao.xml @@ -0,0 +1,67 @@ + + + + + + + + + + insert INTO thr_import_log + (genKey, fromType, updateTime, thirdSysFk, status, importType, remark, filePath, backFilePath, orderId) + values (#{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk}, #{status}, #{importType}, #{remark}, #{filePath}, #{backFilePath}, #{orderId}) + + + + + DELETE + FROM thr_import_log + WHERE id = #{id} + + + + UPDATE thr_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + importType=#{importType}, + orderId=#{orderId}, + + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/ThrOrderImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/ThrOrderImportDetailDao.xml new file mode 100644 index 0000000..7f0b501 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/ThrOrderImportDetailDao.xml @@ -0,0 +1,92 @@ + + + + + + + + + + insert INTO thr_order_import_detail + ( + billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec,batchNo,expireDate, + productDate,count,reCount,status,updateTime,remark,genKeyFk,thirdSysFk,originType + ) + values + ( + #{billNo},#{billdate},#{corpId},#{corpName},#{billType},#{billFlag},#{productId},#{productName},#{spec}, + #{batchNo},#{expireDate},#{productDate},#{count},#{reCount},#{status},#{updateTime},#{remark},#{genKeyFk},#{thirdSysFk},#{originType} + ) + + + + insert INTO thr_order_import_detail + ( + billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec, + batchNo,expireDate,productDate,count,reCount,status,updateTime,remark,genKeyFk,thirdSysFk,originType + ) + values + + ( + #{item.billNo},#{item.billdate},#{item.corpId},#{item.corpName},#{item.billType}, + #{item.billFlag},#{item.productId},#{item.productName},#{item.spec},#{item.batchNo},#{item.expireDate},#{item.productDate}, + #{item.count},#{item.reCount},#{item.status},#{item.updateTime},#{item.remark},#{item.genKeyFk},#{item.thirdSysFk},#{item.originType} + ) + + + + DELETE FROM thr_order_import_detail WHERE id = #{id} + + + DELETE FROM thr_order_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE thr_order_import_detail + + billNo=#{billNo}, + billdate=#{billdate}, + corpId=#{corpId}, + corpName=#{corpName}, + billType=#{billType}, + billFlag=#{billFlag}, + productId=#{productId}, + productName=#{productName}, + spec=#{spec}, + expireDate=#{expireDate}, + batchNo=#{batchNo}, + productDate=#{productDate}, + count=#{count}, + reCount=#{reCount}, + status=#{status}, + updateTime=#{updateTime}, + genKeyFk=#{genKeyFk}, + remark=#{remark}, + thirdSysFk=#{thirdSysFk}, + originType=#{originType}, + + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/ThrOrderImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/ThrOrderImportLogDao.xml new file mode 100644 index 0000000..b22891d --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/ThrOrderImportLogDao.xml @@ -0,0 +1,57 @@ + + + + + + + + + + insert INTO thr_order_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_order_import_log WHERE id = #{id} + + + + UPDATE thr_order_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/ThrProductsImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/ThrProductsImportDetailDao.xml new file mode 100644 index 0000000..ec6001e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/ThrProductsImportDetailDao.xml @@ -0,0 +1,102 @@ + + + + + + + + + + insert INTO thr_products_import_detail + ( + code,name,measname,spec,registerNo,manufactory, + cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, + thirdSysFk,updateTime ,genKeyFk ) + values + ( + #{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm}, + #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms} + #{thirdSysFk},#{updateTime},#{genKeyFk} + ) + + + + insert INTO thr_products_import_detail + ( + code,name,measname,spec,registerNo,manufactory, + cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, + thirdSysFk ,updateTime ,genKeyFk ) + values + + ( + #{item.code}, + #{item.name}, + #{item.measname}, + #{item.spec}, + #{item.registerNo}, + #{item.manufactory}, + #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm}, + #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms}, + #{item.thirdSysFk} ,#{item.updateTime},#{item.genKeyFk} ) + + + + DELETE FROM thr_products_import_detail WHERE id = #{id} + + + DELETE FROM thr_products_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE thr_products_import_detail + + code=#{code}, + name=#{name}, + measname=#{measname}, + spec=#{spec}, + registerNo=#{registerNo}, + cplb=#{cplb}, + flbm=#{flbm}, + qxlb=#{qxlb}, + ybbm=#{ybbm}, + sptm=#{sptm}, + tyshxydm=#{tyshxydm}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + manufactory=#{manufactory}, + cpms=#{cpms}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + genKeyFk=#{genKeyFk}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/ThrProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/ThrProductsImportLogDao.xml new file mode 100644 index 0000000..98ff742 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/ThrProductsImportLogDao.xml @@ -0,0 +1,57 @@ + + + + + + + + + + insert INTO thr_porducts_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_porducts_import_log WHERE id = #{id} + + + + UPDATE thr_porducts_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/UdiInfoImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/UdiInfoImportDetailDao.xml new file mode 100644 index 0000000..a8f2d4b --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/UdiInfoImportDetailDao.xml @@ -0,0 +1,91 @@ + + + + + + + + + + insert INTO basic_products_import_detail + (udiCode, ybbm, sptm, thirdId1, thirdId2, + thirdId3, thirdId4, thirdId, status, updateTime, remark, genKeyFk, dataType, isUseDy) + values (#{udiCode}, #{ybbm}, #{sptm}, + #{thirdId1}, #{thirdId2}, #{thirdId3}, + #{thirdId4}, #{thirdId}, #{status}, + #{updateTime}, #{remark}, #{genKeyFk}, #{dataType}, #{isUseDy}) + + + + insert INTO basic_products_import_detail + (udiCode,ybbm,sptm,thirdId1,thirdId2, + thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk,dataType,isUseDy) + values + + ( + #{item.udiCode}, #{item.ybbm},#{item.sptm}, + #{item.thirdId1}, #{item.thirdId2},#{item.thirdId3}, + #{item.thirdId4}, #{item.thirdId},#{item.status}, + #{item.updateTime},#{item.remark}, #{item.genKeyFk},#{item.dataType},#{item.isUseDy} + ) + + + + DELETE + FROM basic_products_import_detail + WHERE id = #{id} + + + DELETE + FROM basic_products_import_detail + WHERE genKeyFk = #{genKey} + + + + UPDATE basic_products_import_detail + + udiCode=#{udiCode}, + ybbm=#{ybbm}, + sptm=#{sptm}, + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + thirdId=#{thirdId}, + status=#{status}, + updateTime=#{updateTime}, + remark=#{remark}, + dataType=#{dataType}, + isUseDy=#{isUseDy}, + + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/UdiInfoImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/UdiInfoImportLogDao.xml new file mode 100644 index 0000000..a372d0f --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/sync/UdiInfoImportLogDao.xml @@ -0,0 +1,64 @@ + + + + + + + + + + insert INTO basic_products_import_log + (genKey,fromType,updateTime,thirdSysFk,status,dataType) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status},#{dataType} + ) + + + + + DELETE FROM basic_products_import_log WHERE id = #{id} + + + + UPDATE basic_products_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + dataType=#{dataType}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mybatis-config.xml b/api-admin/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 0000000..4a35332 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/static/.gitignore b/api-admin/src/main/resources/static/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/api-admin/src/main/resources/static/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/api-admin/src/main/resources/templates/.gitignore b/api-admin/src/main/resources/templates/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/api-admin/src/main/resources/templates/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/sale/BaseApiAdminApplicationTest.java b/api-admin/src/test/java/com/glxp/sale/BaseApiAdminApplicationTest.java new file mode 100644 index 0000000..81cc95b --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/BaseApiAdminApplicationTest.java @@ -0,0 +1,10 @@ +package com.glxp.sale; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class BaseApiAdminApplicationTest { +} diff --git a/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImplTest.java b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImplTest.java new file mode 100644 index 0000000..46f9776 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImplTest.java @@ -0,0 +1,70 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.sale.BaseApiAdminApplicationTest; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.*; + +import static org.junit.Assert.*; + +public class AuthAdminServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthAdminService authAdminService; + + @Test + public void listAdminPage() { + + Integer page = 1; + Integer limit = 20; + Integer status = 1; + String username = "sale"; + Long roleId = 1L; + + AuthAdminQueryRequest authAdminQueryForm = new AuthAdminQueryRequest(); + authAdminQueryForm.setPage(page); + authAdminQueryForm.setLimit(limit); + authAdminQueryForm.setUserFlag(status); + authAdminQueryForm.setUserName(username); + + List authAdminList = authAdminService.listAdminPage(authAdminQueryForm); + PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); + System.out.println(authAdminPageInfo.getList()); + assertTrue(authAdminPageInfo.getList().size() > 0); + } + + @Test + public void findByUserName() { + } + + @Test + public void findById() { + } + + @Test + public void findPwdById() { + } + + @Test + public void insertAuthAdmin() { + + AuthAdmin authAdmin = new AuthAdmin(); + authAdmin.setUserName("sssfff4"); + authAdmin.setCreateTime(new Date()); + authAdmin.setUserFlag(1); + + boolean b = authAdminService.insertAuthAdmin(authAdmin); + assertTrue(b); + } + + @Test + public void updateAuthAdmin() { + } + +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImplTest.java b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImplTest.java new file mode 100644 index 0000000..4d992b9 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImplTest.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.BaseApiAdminApplicationTest; +import com.glxp.sale.admin.service.auth.AuthLoginService; +import org.junit.Test; + +import javax.annotation.Resource; + + +import java.util.List; + +public class AuthLoginServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthLoginService authLoginService; + + @Test + public void listRuleByAdminId() { + + Long adminId = 2L; + + List strings = authLoginService.listRuleByAdminId(adminId); + + + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java new file mode 100644 index 0000000..e7f8936 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java @@ -0,0 +1,37 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.BaseApiAdminApplicationTest; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.List; + +import static org.junit.Assert.*; + +public class AuthPermissionRuleServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + @Test + public void listByIdIn() { + } + + @Test + public void listByPid() { + List authPermissionRuleList = authPermissionRuleService.listByPid(0L); + + assertTrue(authPermissionRuleList.size() > 0); + } + + @Test + public void listAll() { + + List authPermissionRuleList = authPermissionRuleService.listAll(); + + assertTrue(authPermissionRuleList.size() > 0); + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImplTest.java b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImplTest.java new file mode 100644 index 0000000..13a0f49 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/AuthRoleServiceImplTest.java @@ -0,0 +1,32 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.BaseApiAdminApplicationTest; +import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.service.auth.AuthRoleService; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.List; + +import static org.junit.Assert.*; + +public class AuthRoleServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthRoleService authRoleService; + + @Test + public void listAdminPage() { + } + + @Test + public void listAuthAdminRolePage() { + + Integer page = 1; + Integer limit = 20; + + List authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null); + assertTrue(authRoleList.size() > 0); + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/SystemPDFTemplateRelevanceServiceImplTest.java b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/SystemPDFTemplateRelevanceServiceImplTest.java new file mode 100644 index 0000000..ead8b2e --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/admin/service/auth/impl/SystemPDFTemplateRelevanceServiceImplTest.java @@ -0,0 +1,46 @@ +package com.glxp.sale.admin.service.auth.impl; + +import com.glxp.sale.BaseApiAdminApplicationTest; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; +import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import org.junit.Test; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.*; + +public class SystemPDFTemplateRelevanceServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthRoleAdminService authRoleAdminService; + + @Test + public void listByAdminId() { + } + + @Test + public void listByRoleId() { + } + + @Test + public void insertAuthRoleAdminAll() { + + List authRoleAdminList = new ArrayList<>(); + + long len = 3; + for (long i = 1; i <= len; i++) { + AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); + if (i % 2 == 0) { + authRoleAdmin.setRole_id(i); + } + authRoleAdmin.setAdmin_id(i + 1); + authRoleAdminList.add(authRoleAdmin); + } + int i = authRoleAdminService.insertAuthRoleAdminAll(authRoleAdminList); + + System.out.println(i); + assertEquals(1, i); + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/sale/admin/util/PermissionRuleTreeUtilsTest.java b/api-admin/src/test/java/com/glxp/sale/admin/util/PermissionRuleTreeUtilsTest.java new file mode 100644 index 0000000..c4c2c5d --- /dev/null +++ b/api-admin/src/test/java/com/glxp/sale/admin/util/PermissionRuleTreeUtilsTest.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.util; + +import com.glxp.sale.BaseApiAdminApplicationTest; +import com.glxp.sale.admin.entity.auth.AuthPermissionRule; +import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; +import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.List; + +public class PermissionRuleTreeUtilsTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + @Test + public void merge() { + + List authPermissionRules = authPermissionRuleService.listAll(); + List merge = PermissionRuleTreeUtils.merge(authPermissionRules,0L); + System.out.println(merge); + + } +} \ No newline at end of file diff --git a/api-common/.gitignore b/api-common/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/api-common/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/api-common/pom.xml b/api-common/pom.xml new file mode 100644 index 0000000..439bd75 --- /dev/null +++ b/api-common/pom.xml @@ -0,0 +1,29 @@ + + + + sale + com.glxp + 0.0.1 + + 4.0.0 + + api-common + + + + + org.projectlombok + lombok + true + + + + org.apache.commons + commons-lang3 + + + + + \ No newline at end of file diff --git a/api-common/src/main/java/com/glxp/sale/common/constant/CacheConstant.java b/api-common/src/main/java/com/glxp/sale/common/constant/CacheConstant.java new file mode 100644 index 0000000..bba3d68 --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/constant/CacheConstant.java @@ -0,0 +1,10 @@ +package com.glxp.sale.common.constant; + +/** + * redis 常量 + */ +public interface CacheConstant { + + String ADMIN_AUTH_RULES = "admin_auth_rules:%s"; // 管理员的权限 + +} diff --git a/api-common/src/main/java/com/glxp/sale/common/converter/LongList2StringConverter.java b/api-common/src/main/java/com/glxp/sale/common/converter/LongList2StringConverter.java new file mode 100644 index 0000000..178ca25 --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/converter/LongList2StringConverter.java @@ -0,0 +1,33 @@ +package com.glxp.sale.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 longList, String regex) { + + if (longList.isEmpty()) { + return null; + } + Set stringSet = new HashSet<>(); + for (Long value: longList){ + stringSet.add(value.toString()); + } + if (stringSet.isEmpty()) { + return null; + } + return StringUtils.join(stringSet, regex); + } +} diff --git a/api-common/src/main/java/com/glxp/sale/common/converter/String2LongListConverter.java b/api-common/src/main/java/com/glxp/sale/common/converter/String2LongListConverter.java new file mode 100644 index 0000000..75f2875 --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/converter/String2LongListConverter.java @@ -0,0 +1,38 @@ +package com.glxp.sale.common.converter; + + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * 字符串切割为 List + */ +public class String2LongListConverter { + + /** + * + * @param string + * @param regex 切割的字符 + * @return + */ + public static List 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 longList = new ArrayList<>(); + for (String str : strings) { + longList.add(Long.valueOf(str)); + } + return longList; + }catch (Exception e) { + return Collections.emptyList(); + } + } +} diff --git a/api-common/src/main/java/com/glxp/sale/common/converter/String2StringListConverter.java b/api-common/src/main/java/com/glxp/sale/common/converter/String2StringListConverter.java new file mode 100644 index 0000000..2a5d3eb --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/converter/String2StringListConverter.java @@ -0,0 +1,34 @@ +package com.glxp.sale.common.converter; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * 字符串切割为 List + */ +public class String2StringListConverter { + + /** + * + * @param string + * @param regex 切割的字符 + * @return + */ + public static List 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(); + } + } +} diff --git a/api-common/src/main/java/com/glxp/sale/common/enums/ResultEnum.java b/api-common/src/main/java/com/glxp/sale/common/enums/ResultEnum.java new file mode 100644 index 0000000..0fed18d --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/enums/ResultEnum.java @@ -0,0 +1,31 @@ +package com.glxp.sale.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; + } +} diff --git a/api-common/src/main/java/com/glxp/sale/common/req/BaseLimitRequest.java b/api-common/src/main/java/com/glxp/sale/common/req/BaseLimitRequest.java new file mode 100644 index 0000000..d017394 --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/req/BaseLimitRequest.java @@ -0,0 +1,56 @@ +package com.glxp.sale.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(); + } + +} diff --git a/api-common/src/main/java/com/glxp/sale/common/req/BaseRequest.java b/api-common/src/main/java/com/glxp/sale/common/req/BaseRequest.java new file mode 100644 index 0000000..74a5cac --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/req/BaseRequest.java @@ -0,0 +1,37 @@ +package com.glxp.sale.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; + } +} diff --git a/api-common/src/main/java/com/glxp/sale/common/res/BaseResponse.java b/api-common/src/main/java/com/glxp/sale/common/res/BaseResponse.java new file mode 100644 index 0000000..716ddcf --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/res/BaseResponse.java @@ -0,0 +1,17 @@ +package com.glxp.sale.common.res; + +import lombok.Data; + +/** + * 返回结果类 + * @param + */ +@Data +public class BaseResponse { + + private Integer code; + + private String message; + + private T data; +} diff --git a/api-common/src/main/java/com/glxp/sale/common/util/ResultVOUtils.java b/api-common/src/main/java/com/glxp/sale/common/util/ResultVOUtils.java new file mode 100644 index 0000000..7702da5 --- /dev/null +++ b/api-common/src/main/java/com/glxp/sale/common/util/ResultVOUtils.java @@ -0,0 +1,70 @@ +package com.glxp.sale.common.util; + +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.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 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 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); + } + +} diff --git a/api-common/src/main/resources/application.properties b/api-common/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/api-common/src/test/java/com/glxp/sale/common/util/ResultVOUtilsTest.java b/api-common/src/test/java/com/glxp/sale/common/util/ResultVOUtilsTest.java new file mode 100644 index 0000000..16ab3dc --- /dev/null +++ b/api-common/src/test/java/com/glxp/sale/common/util/ResultVOUtilsTest.java @@ -0,0 +1,8 @@ +package com.glxp.sale.common.util; + + +public class ResultVOUtilsTest { + + public void success() { + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0c21b5e --- /dev/null +++ b/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + com.glxp + sale + 0.0.1 + + api-admin + api-common + + pom + + api + 药品零售管理系统 + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + + 1.8 + + + + + + + + com.glxp + api-common + ${version} + + + + + com.alibaba + fastjson + 1.2.51 + + + + + org.apache.commons + commons-lang3 + 3.9 + + + + + + diff --git a/scripts/vue-admin.sql b/scripts/vue-admin.sql new file mode 100644 index 0000000..a26086b --- /dev/null +++ b/scripts/vue-admin.sql @@ -0,0 +1,234 @@ +/* +Navicat MySQL Data Transfer + +Source Server : php +Source Server Version : 50553 +Source Host : localhost:3306 +Source Database : vue-admin + +Target Server Type : MYSQL +Target Server Version : 50553 +File Encoding : 65001 + +Date: 2018-11-20 18:59:57 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for ad +-- ---------------------------- +DROP TABLE IF EXISTS `ad`; +CREATE TABLE `ad` ( + `ad_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '广告ID', + `title` varchar(255) NOT NULL COMMENT '广告标题', + `describe` varchar(255) NOT NULL DEFAULT '' COMMENT '描述', + `pic` varchar(255) NOT NULL DEFAULT '' COMMENT '图片的地址', + `jump_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '跳转方式（0，web 页面，1：APP内链接，2：小程序）', + `jump_url` varchar(255) NOT NULL DEFAULT '' COMMENT '跳转的url路径', + `ios_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'ios 的类名', + `android_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'android 的类名', + `wxa_appid` varchar(50) NOT NULL DEFAULT '' COMMENT '微信小程序的APPID（跳转类型为 1 时有效）', + `channel_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '渠道名单类型（0：不做处理，1：白名单，2：黑名单）', + `channel_list` varchar(255) NOT NULL DEFAULT '' COMMENT '渠道黑名单', + `android_version_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'android 版本名单类型（0：不做处理，1：白名单，2：黑名单）', + `android_version_list` varchar(255) NOT NULL DEFAULT '' COMMENT 'android 版本黑名单', + `ios_version_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'ios 版本名单类型（0：不做处理，1：白名单，2：黑名单）', + `ios_version_list` varchar(255) NOT NULL DEFAULT '' COMMENT 'ios 版本黑名单', + `new_show_start_num` int(11) NOT NULL DEFAULT '0' COMMENT '新用户从第几次开始展示', + `new_show_max_num` int(11) NOT NULL DEFAULT '0' COMMENT '新用户最大展示几次', + `old_show_start_num` int(11) NOT NULL DEFAULT '0' COMMENT '老用户第几次开始展示', + `old_show_max_num` int(11) NOT NULL DEFAULT '0' COMMENT '老用户最大展示几次', + `start_time` datetime DEFAULT NULL COMMENT '开始时间', + `end_time` datetime DEFAULT NULL COMMENT '结束时间', + `event_name` varchar(255) NOT NULL DEFAULT '' COMMENT '统计事件名称', + `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '广告状态（0：禁用，1：正常）', + `create_time` datetime NOT NULL COMMENT '创建时间', + `modified_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ad_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='广告表'; + +-- ---------------------------- +-- Table structure for ad_site +-- ---------------------------- +DROP TABLE IF EXISTS `ad_site`; +CREATE TABLE `ad_site` ( + `site_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '广告位id', + `site_name` varchar(255) NOT NULL COMMENT '广告位名称', + `describe` varchar(255) NOT NULL DEFAULT '' COMMENT '广告位描述', + `ad_ids` varchar(255) NOT NULL DEFAULT '' COMMENT '广告位的广告id（用 , 隔开）', + `create_time` datetime NOT NULL COMMENT '创建时间', + `modified_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`site_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='广告位'; + +-- ---------------------------- +-- Table structure for auth_admin +-- ---------------------------- +DROP TABLE IF EXISTS `auth_admin`; +CREATE TABLE `auth_admin` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `username` varchar(60) NOT NULL DEFAULT '' COMMENT '用户名', + `password` varchar(64) NOT NULL DEFAULT '' COMMENT '登录密码；sp_password加密', + `tel` varchar(50) NOT NULL DEFAULT '' COMMENT '用户手机号', + `email` varchar(100) NOT NULL DEFAULT '' COMMENT '登录邮箱', + `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '用户头像', + `sex` smallint(1) NOT NULL DEFAULT '0' COMMENT '性别；0：保密，1：男；2：女', + `last_login_ip` varchar(16) NOT NULL DEFAULT '' COMMENT '最后登录ip', + `last_login_time` datetime NOT NULL COMMENT '最后登录时间', + `create_time` datetime NOT NULL COMMENT '注册时间', + `status` int(11) NOT NULL DEFAULT '1' COMMENT '用户状态 0：禁用； 1：正常 ；2：未验证', + PRIMARY KEY (`id`), + KEY `user_login_key` (`username`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='管理员表'; + +-- ---------------------------- +-- Records of auth_admin +-- ---------------------------- +INSERT INTO `auth_admin` VALUES ('1', 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 'admin', 'lmxdawn@gmail.com', 'sssss', '0', '127.0.0.1', '2018-07-06 17:19:00', '2018-07-06 17:19:00', '1'); + +-- ---------------------------- +-- Table structure for auth_permission +-- ---------------------------- +DROP TABLE IF EXISTS `auth_permission`; +CREATE TABLE `auth_permission` ( + `role_id` int(11) unsigned NOT NULL COMMENT '角色', + `permission_rule_id` int(11) NOT NULL DEFAULT '0' COMMENT '权限id', + `type` varchar(30) DEFAULT NULL COMMENT '权限规则分类，请加应用前缀,如admin_' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限授权表'; + +-- ---------------------------- +-- Records of auth_permission +-- ---------------------------- +INSERT INTO `auth_permission` VALUES ('1', '4', 'admin'); +INSERT INTO `auth_permission` VALUES ('1', '3', 'admin'); +INSERT INTO `auth_permission` VALUES ('1', '2', 'admin'); +INSERT INTO `auth_permission` VALUES ('1', '1', 'admin'); + +-- ---------------------------- +-- Table structure for auth_permission_rule +-- ---------------------------- +DROP TABLE IF EXISTS `auth_permission_rule`; +CREATE TABLE `auth_permission_rule` ( + `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '规则编号', + `pid` int(11) NOT NULL DEFAULT '0' COMMENT '父级id', + `name` char(80) NOT NULL DEFAULT '' COMMENT '规则唯一标识', + `title` char(20) NOT NULL DEFAULT '' COMMENT '规则中文名称', + `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：为1正常，为0禁用', + `condition` char(100) NOT NULL DEFAULT '' COMMENT '规则表达式，为空表示存在就验证，不为空表示按照条件验证', + `listorder` int(10) NOT NULL DEFAULT '0' COMMENT '排序，优先级，越小优先级越高', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COMMENT='规则表'; + +-- ---------------------------- +-- Records of auth_permission_rule +-- ---------------------------- +INSERT INTO `auth_permission_rule` VALUES ('1', '0', 'user_manage', '用户管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('2', '1', 'user_manage/admin_manage', '管理组', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('3', '2', 'admin/auth_admin/index', '管理员管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('4', '3', 'admin/auth_admin/save', '添加管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('5', '3', 'admin/auth_admin/edit', '编辑管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('6', '3', 'admin/auth_admin/delete', '删除管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('7', '2', 'admin/auth_role/index', '角色管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('8', '7', 'admin/auth_role/save', '添加角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('9', '7', 'admin/auth_role/edit', '编辑角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('10', '7', 'admin/auth_role/delete', '删除角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('11', '7', 'admin/auth_role/auth', '角色授权', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('12', '2', 'admin/auth_permission_rule/index', '权限管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('13', '12', 'admin/auth_permission_rule/save', '添加权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('14', '12', 'admin/auth_permission_rule/edit', '编辑权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('15', '12', 'admin/auth_permission_rule/delete', '删除权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('16', '0', 'ad_manage', '广告相关', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('17', '16', 'admin/ad_site/index', '广告位管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('18', '17', 'admin/ad_site/save', '广告位添加', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('19', '17', 'admin/ad_site/edit', '广告位编辑', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('20', '17', 'admin/ad_site/delete', '广告位删除', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('21', '16', 'admin/ad/index', '广告管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('22', '21', 'admin/ad/save', '广告添加', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('23', '21', 'admin/ad/edit', '广告编辑', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('24', '21', 'admin/ad/delete', '广告删除', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('25', '17', 'admin/ad_site/adlist', '广告位选择时的广告列表', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); + +-- ---------------------------- +-- Table structure for auth_role +-- ---------------------------- +DROP TABLE IF EXISTS `auth_role`; +CREATE TABLE `auth_role` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(20) NOT NULL COMMENT '角色名称', + `pid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父角色ID', + `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态', + `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + `listorder` int(3) NOT NULL DEFAULT '0' COMMENT '排序，优先级，越小优先级越高', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='角色表'; + +-- ---------------------------- +-- Records of auth_role +-- ---------------------------- +INSERT INTO `auth_role` VALUES ('1', '超级管理员', '0', '1', '拥有网站最高管理员权限！', '2018-07-06 17:19:00', '2018-07-06 17:19:00', '0'); + +-- ---------------------------- +-- Table structure for auth_role_admin +-- ---------------------------- +DROP TABLE IF EXISTS `auth_role_admin`; +CREATE TABLE `auth_role_admin` ( + `role_id` int(11) unsigned DEFAULT '0' COMMENT '角色 id', + `admin_id` int(11) DEFAULT '0' COMMENT '管理员id' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户角色对应表'; + +-- ---------------------------- +-- Records of auth_role_admin +-- ---------------------------- + +-- ---------------------------- +-- Table structure for file_resource +-- ---------------------------- +DROP TABLE IF EXISTS `file_resource`; +CREATE TABLE `file_resource` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '资源id', + `tag_id` int(11) NOT NULL DEFAULT '0' COMMENT '资源分组id', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '资源的类型（0：图片）', + `filename` varchar(255) NOT NULL DEFAULT '' COMMENT '资源的原名', + `path` varchar(255) NOT NULL DEFAULT '' COMMENT '资源的路径（不加 域名的地址）', + `size` int(11) NOT NULL DEFAULT '0' COMMENT '大小', + `ext` varchar(10) NOT NULL DEFAULT '' COMMENT '资源的文件后缀', + `create_time` datetime NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='资源表'; + +-- ---------------------------- +-- Records of file_resource +-- ---------------------------- +INSERT INTO `file_resource` VALUES ('1', '1', '0', 'Group 5.png', 'resources/image/20180530/854ae62758c585be5128cf344a511242.png', '7539', 'png', '2018-05-30 20:41:54'); +INSERT INTO `file_resource` VALUES ('2', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/c356ca140f631a512f1c3a5e37a15dc1.png', '11507', 'png', '2018-08-23 13:38:42'); +INSERT INTO `file_resource` VALUES ('3', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/4549c39e9c07c35681ee9fa94e0fc07e.png', '11507', 'png', '2018-08-23 14:05:18'); +INSERT INTO `file_resource` VALUES ('4', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('5', '0', '0', '', '', '2000000', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('6', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('7', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('8', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/0c424412b231eb8cb969377e15dbb812.png', '11507', 'png', '2018-08-23 15:53:32'); +INSERT INTO `file_resource` VALUES ('9', '0', '0', '232826334630444283.png', 'FjBRVPOPF9gLeNBCAvK7jbif4yg8', '9668', 'png', '2018-08-23 16:08:13'); +INSERT INTO `file_resource` VALUES ('10', '0', '0', '232826334630444283.png', 'FjBRVPOPF9gLeNBCAvK7jbif4yg8', '9668', 'png', '2018-08-23 16:09:07'); +INSERT INTO `file_resource` VALUES ('11', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/52af5f8556a3af84cee696972b61baf4.png', '11507', 'png', '2018-08-23 17:06:05'); + +-- ---------------------------- +-- Table structure for file_resource_tag +-- ---------------------------- +DROP TABLE IF EXISTS `file_resource_tag`; +CREATE TABLE `file_resource_tag` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '资源分组的id', + `tag` varchar(255) NOT NULL DEFAULT '' COMMENT '资源分组的tag', + `create_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='资源的分组表'; + +-- ---------------------------- +-- Records of file_resource_tag +-- ---------------------------- +INSERT INTO `file_resource_tag` VALUES ('1', '测试', '2018-05-30 20:41:48');