Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseSupplierController.java

@@ -2,9 +2,12 @@ package com.ozs.web.controller.base;
 
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.base.domain.BaseSupplier;
 import com.ozs.base.service.BaseSupplierService;
+import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.system.domain.SysConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 供应商管理
  *
@@ -27,14 +32,55 @@ public class BaseSupplierController extends BaseController {
     @Autowired
     private BaseSupplierService baseSupplierService;
 
-    @ApiOperation("新增供应商户")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "body", dataType = "BaseSupplier",
-            name = "req", value = "信息参数", required = true)})
-    @PostMapping("/save")
-    public AjaxResult save(BaseSupplier baseSupplier) {
+    @ApiOperation(value = "新增供应商户", notes = "")
+    @PostMapping("/insertBaseSupplier")
+    public AjaxResult insertBaseSupplier(BaseSupplier baseSupplier) {
         if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getSupplierName())) {
             return error("供应商名称不能为空");
         }
         return toAjax(baseSupplierService.insertBaseSupplier(baseSupplier));
     }
+
+    @ApiOperation(value = "删除供应商户", notes = "必传ID")
+    @PostMapping("/deleteBaseSupplier")
+    public AjaxResult deleteBaseSupplier(BaseSupplier baseSupplier) {
+        if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getId())) {
+            return error("删除ID不能为空");
+        }
+        return toAjax(baseSupplierService.deleteBaseSupplier(baseSupplier.getId()));
+    }
+
+    @ApiOperation(value = "修改供应商户", notes = "必传ID及修改字段")
+    @PostMapping("/updateBaseSupplier")
+    public AjaxResult updateBaseSupplier(BaseSupplier baseSupplier) {
+        if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getId())) {
+            return error("修改数据及ID不能为空");
+        }
+        return toAjax(baseSupplierService.updateBaseSupplier(baseSupplier));
+    }
+
+    @ApiOperation(value = "预先采购开关", notes = "必传id,supplierAdvancePurchase 其他字段不传； 关闭传0，开启传1")
+    @PostMapping("/updateBaseSupplierAdvancePurchase")
+    public AjaxResult updateBaseSupplierAdvancePurchase(BaseSupplier baseSupplier) {
+        if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getId()) || StringUtils.isNotNull(baseSupplier.getSupplierAdvancePurchase())) {
+            return error("预先采购及ID不能为空");
+        }
+        return toAjax(baseSupplierService.updateBaseSupplier(baseSupplier));
+    }
+
+    @ApiOperation(value = "黑白名单开关", notes = "必传id,supplierType 其他字段不传； 黑名单传0，白名单传1")
+    @PostMapping("/updateSupplierType")
+    public AjaxResult updateSupplierType(BaseSupplier baseSupplier) {
+        if (StringUtils.isNull(baseSupplier) || StringUtils.isNull(baseSupplier.getId()) || StringUtils.isNotNull(baseSupplier.getSupplierType())) {
+            return error("状态及ID不能为空");
+        }
+        return toAjax(baseSupplierService.updateBaseSupplier(baseSupplier));
+    }
+
+    @ApiOperation(value = "查询供应商户", notes = "非必传 查询条件：供应商名称，供应商类型，供应商状态，预先采购状态")
+    @PostMapping("/selectBaseSupplier")
+    public TableDataInfo selectBaseSupplier(BaseSupplier baseSupplier) {
+        List<BaseSupplier> baseSupplierList = baseSupplierService.selectBaseSupplier(baseSupplier);
+        return getDataTable(baseSupplierList);
+    }
 }

purchase-admin/src/main/java/com/ozs/web/controller/system/SysLoginController.java

@@ -3,6 +3,11 @@ package com.ozs.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.framework.manager.AsyncManager;
+import com.ozs.framework.manager.factory.AsyncFactory;
+import com.ozs.framework.web.service.TokenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +25,8 @@ import com.ozs.framework.web.service.SysLoginService;
 import com.ozs.framework.web.service.SysPermissionService;
 import com.ozs.system.service.ISysMenuService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 登录验证
  *
@@ -38,6 +45,9 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 登录方法
      *
@@ -90,4 +100,26 @@ public class SysLoginController
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
+
+    /**
+     * 登录方法
+     *
+     * @return 结果
+     */
+    @ApiOperation("退出方法")
+    @PostMapping("/logout")
+    public AjaxResult logout(HttpServletRequest request)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if (StringUtils.isNotNull(loginUser))
+        {
+            String userName = loginUser.getUsername();
+            // 删除用户缓存记录
+            tokenService.delLoginUser(loginUser.getToken());
+            // 记录用户退出日志
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
+        }
+        return ajax;
+    }
 }

purchase-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,139 @@
+# 项目相关配置
+purchase:
+  # 名称
+  name: purchase
+  # 版本
+  version: 1.0.0
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/purchase/uploadPath，Linux配置 /home/purchase/uploadPath）
+  profile: C:/purchase/uploadPath
+#  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数，默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数，默认为200
+      max: 800
+      # Tomcat启动初始化的线程数，默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.ozs: debug
+    org.springframework: warn
+
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 124.70.58.209
+    # 端口，默认为6379
+    port: 7001
+    # 数据库索引
+    database: 0
+    # 密码
+    password: 106@qwe123
+    # 连接超时时间    timeout: 100s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
+
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ozs.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis-plus配置
+mybatis-plus:
+  config-location: classpath:mybatis/mybatis-config.xml
+  typeAliasesPackage: com.ozs.**.domain
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+#  pathMapping: /dev-api
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+elasticsearch:
+  host: 124.70.58.209
+  port: 9121
+#  host: 127.0.0.1
+#  port: 9200

purchase-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,145 @@
+# 项目相关配置
+purchase:
+  # 名称
+  name: purchase
+  # 版本
+  version: 1.0.0
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/purchase/uploadPath，Linux配置 /home/purchase/uploadPath）
+  profile: C:/purchase/uploadPath
+#  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数，默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数，默认为200
+      max: 800
+      # Tomcat启动初始化的线程数，默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.ozs: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 124.70.58.209
+    # 端口，默认为6379
+    port: 7001
+    # 数据库索引
+    database: 0
+    # 密码
+    password: 106@qwe123
+    # 连接超时时间    timeout: 100s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
+
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ozs.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis-plus配置
+mybatis-plus:
+  config-location: classpath:mybatis/mybatis-config.xml
+  typeAliasesPackage: com.ozs.**.domain
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+#  pathMapping: /dev-api
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+elasticsearch:
+  host: 124.70.58.209
+  port: 9121
+#  host: 127.0.0.1
+#  port: 9200

purchase-admin/src/main/resources/application-test.yml

@@ -0,0 +1,137 @@
+# 项目相关配置
+purchase:
+  # 名称
+  name: purchase
+  # 版本
+  version: 1.0.0
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ Windows配置D:/purchase/uploadPath，Linux配置 /home/purchase/uploadPath）
+  profile: /home/purchase/uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数，默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数，默认为200
+      max: 800
+      # Tomcat启动初始化的线程数，默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.ozs: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 124.70.58.209
+    # 端口，默认为6379
+    port: 7001
+    # 数据库索引
+    database: 0
+    # 密码
+    password: 106@qwe123
+    # 连接超时时间    timeout: 100s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
+
+# MyBatis配置
+mybatis:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ozs.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis-plus配置
+mybatis-plus:
+  config-location: classpath:mybatis/mybatis-config.xml
+  typeAliasesPackage: com.ozs.**.domain
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+#  pathMapping: /dev-api
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+elasticsearch:
+  host: 124.70.58.209
+  port: 9121
+#  host: 127.0.0.1
+#  port: 9200

purchase-admin/src/main/resources/application.yml

@@ -1,145 +1,13 @@
-# 项目相关配置
-purchase:
-  # 名称
-  name: purchase
-  # 版本
-  version: 1.0.0
-  # 版权年份
-  copyrightYear: 2023
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/purchase/uploadPath，Linux配置 /home/purchase/uploadPath）
-  profile: C:/purchase/uploadPath
-#  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
 
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 9125
   servlet:
     # 应用的访问路径
     context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
-
-# 日志配置
-logging:
-  level:
-    com.ozs: debug
-    org.springframework: warn
-
-# 用户配置
-user:
-  password:
-    # 密码最大错误次数
-    maxRetryCount: 5
-    # 密码锁定时间（默认10分钟）
-    lockTime: 10
 
 # Spring配置
 spring:
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
   profiles:
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  # redis 配置
-  redis:
-    # 地址
-    host: 124.70.58.209
-    # 端口，默认为6379
-    port: 7001
-    # 数据库索引
-    database: 0
-    # 密码
-    password: 106@qwe123
-    # 连接超时时间    timeout: 100s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-
-# token配置
-token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 30
-
-# MyBatis配置
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ozs.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# MyBatis-plus配置
-mybatis-plus:
-  config-location: classpath:mybatis/mybatis-config.xml
-  typeAliasesPackage: com.ozs.**.domain
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-
-# PageHelper分页插件
-pagehelper:
-  helperDialect: mysql
-  supportMethodsArguments: true
-  params: count=countSql
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-#  pathMapping: /dev-api
-  pathMapping: /
-
-# 防止XSS攻击
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*
-
-
-elasticsearch:
-  host: 124.70.58.209
-  port: 9121
-#  host: 127.0.0.1
-#  port: 9200
+    active: druid,test

purchase-admin/src/main/resources/logback.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-<!--	<property name="log.path" value="/home/ruoyi/logs" />-->
-    <property name="log.path" value="C:/purchase/logs" />
+    <property name="log.path" value="/home/purchase/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

purchase-common/src/main/java/com/ozs/common/utils/file/FileUtils.java

@@ -13,7 +13,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -22,7 +21,6 @@ import com.ozs.common.utils.EsUtil;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.vo.EsMessage;
 import com.ozs.common.vo.FileMessage;
-import jdk.internal.org.xml.sax.SAXException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -39,8 +37,6 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 文件处理工具类

purchase-system/src/main/java/com/ozs/base/domain/BaseSupplier.java

@@ -10,10 +10,16 @@ import lombok.Data;
 @Data
 public class BaseSupplier {
     private int id;
+    // 供应商名称
     private String supplierName;
+    // 供应商负责人
     private String supplierResponsiblePerson;
+    // 供应商地址
     private String supplierAddress;
+    // 供应商类型 黑白名单
     private String supplierType;
+    // 状态
     private String supplierState;
+    // 预先采购
     private String supplierAdvancePurchase;
 }

purchase-system/src/main/java/com/ozs/base/mapper/BaseSupplierMapper.java

@@ -3,6 +3,8 @@ package com.ozs.base.mapper;
 import com.ozs.base.domain.BaseSupplier;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 供应商管理
  *
@@ -12,10 +14,26 @@ import org.apache.ibatis.annotations.Mapper;
 public interface BaseSupplierMapper {
 
     /**
-     * 新增参数配置
-     *
-     * @param baseSupplier 参数配置信息
-     * @return 结果
+     * 新增
+     * @param baseSupplier 供应商信息
+     */
+    int insertBaseSupplier(BaseSupplier baseSupplier);
+
+    /**
+     * 删除
+     * @param id 供应商ID
+     */
+    int deleteBaseSupplier(int id);
+
+    /**
+     * 修改
+     * @param baseSupplier 供应商信息
+     */
+    int updateBaseSupplier(BaseSupplier baseSupplier);
+
+    /**
+     * 查询
+     * @param baseSupplier 供应商信息
      */
-    public int insertBaseSupplier(BaseSupplier baseSupplier);
+    List<BaseSupplier> selectBaseSupplier(BaseSupplier baseSupplier);
 }

purchase-system/src/main/java/com/ozs/base/service/BaseSupplierService.java

@@ -2,6 +2,8 @@ package com.ozs.base.service;
 
 import com.ozs.base.domain.BaseSupplier;
 
+import java.util.List;
+
 /**
  * 供应商管理
  *
@@ -11,10 +13,25 @@ public interface BaseSupplierService {
 
     /**
      * 新增供应商
-     *
      * @param baseSupplier 供应商信息
-     * @return 结果
      */
-    public int insertBaseSupplier(BaseSupplier baseSupplier);
+    int insertBaseSupplier(BaseSupplier baseSupplier);
+
+    /**
+     * 删除供应商
+     * @param id 供应商ID
+     */
+    int deleteBaseSupplier(int id);
 
+    /**
+     * 修改供应商
+     * @param baseSupplier 供应商信息
+     */
+    int updateBaseSupplier(BaseSupplier baseSupplier);
+
+    /**
+     * 查询供应商
+     * @param baseSupplier 供应商信息
+     */
+    List<BaseSupplier> selectBaseSupplier(BaseSupplier baseSupplier);
 }

purchase-system/src/main/java/com/ozs/base/service/impl/BaseSupplierServiceImpl.java

@@ -6,6 +6,8 @@ import com.ozs.base.service.BaseSupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 供应商管理
  *
@@ -21,4 +23,19 @@ public class BaseSupplierServiceImpl implements BaseSupplierService {
     public int insertBaseSupplier(BaseSupplier baseSupplier) {
         return baseSupplierMapper.insertBaseSupplier(baseSupplier);
     }
+
+    @Override
+    public int deleteBaseSupplier(int id) {
+        return baseSupplierMapper.deleteBaseSupplier(id);
+    }
+
+    @Override
+    public int updateBaseSupplier(BaseSupplier baseSupplier) {
+        return baseSupplierMapper.updateBaseSupplier(baseSupplier);
+    }
+
+    @Override
+    public List<BaseSupplier> selectBaseSupplier(BaseSupplier baseSupplier) {
+        return baseSupplierMapper.selectBaseSupplier(baseSupplier);
+    }
 }

purchase-system/src/main/resources/mapper/base/BaseSupplierMapper.xml

@@ -3,25 +3,111 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.base.mapper.BaseSupplierMapper">
+    <resultMap type="com.ozs.base.domain.BaseSupplier" id="BaseSupplierResult">
+        <id property="id" column="id"/>
+        <result property="supplierName" column="supplier_name"/>
+        <result property="supplierResponsiblePerson" column="supplier_responsible_person"/>
+        <result property="supplierAddress" column="supplier_address"/>
+        <result property="supplierType" column="supplier_type"/>
+        <result property="supplierState" column="supplier_state"/>
+        <result property="supplierAdvancePurchase" column="supplier_advance_purchase"/>
+    </resultMap>
 
-    <insert id="insertBaseSupplier" parameterType="BaseSupplier">
+    <insert id="insertBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier">
         insert into base_supplier (
-        <if test="supplierName != null and supplierName != '' ">supplier_name,</if>
-        <if test="supplierResponsiblePerson != null and supplierResponsiblePerson != '' ">supplier_responsible_person,
+        <if test="supplierName != null and supplierName != '' ">
+            supplier_name,
+        </if>
+        <if test="supplierResponsiblePerson != null and supplierResponsiblePerson != '' ">
+            supplier_responsible_person,
+        </if>
+        <if test="supplierAddress != null and supplierAddress != '' ">
+            supplier_address,
+        </if>
+        <if test="supplierType != null and supplierType != '' ">
+            supplier_type,
+        </if>
+        <if test="supplierState != null and supplierState != ''">
+            supplier_state,
+        </if>
+        <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">
+            supplier_advance_purchase
         </if>
-        <if test="supplierAddress != null and supplierAddress != '' ">supplier_address,</if>
-        <if test="supplierType != null and supplierType != '' ">supplier_type,</if>
-        <if test="supplierState != null and supplierState != ''">supplier_state,</if>
-        <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">supplier_advance_purchase,</if>
         ) values (
-        <if test="supplierName != null and supplierName != ''">#{supplierName},</if>
-        <if test="supplierResponsiblePerson != null and supplierResponsiblePerson != ''">#{supplierResponsiblePerson},
+        <if test="supplierName != null and supplierName != ''">
+            #{supplierName},
+        </if>
+        <if test="supplierResponsiblePerson != null and supplierResponsiblePerson != ''">
+            #{supplierResponsiblePerson},
+        </if>
+        <if test="supplierAddress != null and supplierAddress != ''">
+            #{supplierAddress},
+        </if>
+        <if test="supplierType != null and supplierType != ''">
+            #{supplierType},
+        </if>
+        <if test="supplierState != null and supplierState != ''">
+            #{supplierState},
+        </if>
+        <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">
+            #{supplierAdvancePurchase}
         </if>
-        <if test="supplierAddress != null and supplierAddress != ''">#{supplierAddress},</if>
-        <if test="supplierType != null and supplierType != ''">#{supplierType},</if>
-        <if test="supplierState != null and supplierState != ''">#{supplierState},</if>
-        <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">#{supplierAdvancePurchase},</if>
         )
     </insert>
 
+    <delete id="deleteBaseSupplier" parameterType="java.lang.Integer">
+        delete from base_supplier where id = #{id}
+    </delete>
+
+    <update id="updateBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier">
+        update base_supplier
+        <set>
+            <if test="supplierName != null and supplierName != ''">
+                supplier_name = #{supplierName},
+            </if>
+            <if test="supplierResponsiblePerson != null and supplierResponsiblePerson != ''">
+                supplier_responsible_person = #{supplierResponsiblePerson},
+            </if>
+            <if test="supplierAddress != null and supplierAddress != ''">
+                supplier_address = #{supplierAddress},
+            </if>
+            <if test="supplierType != null and supplierType != ''">
+                supplier_type = #{supplierType},
+            </if>
+            <if test="supplierState != null and supplierState != ''">
+                supplier_state = #{supplierState},
+            </if>
+            <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != '' ">
+                supplier_advance_purchase = #{supplierAdvancePurchase},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="selectBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier" resultMap="BaseSupplierResult">
+        select * from base_supplier
+        <where>
+            <if test="id != null and id != ''">
+                id = #{id},
+            </if>
+            <if test="supplierName != null and supplierName != ''">
+                supplier_name like '% +' #{supplierName} '+ %',
+            </if>
+            <if test="supplierResponsiblePerson != null and supplierResponsiblePerson != ''">
+                supplier_responsible_person like '% +' #{supplierResponsiblePerson} '+ %',
+            </if>
+            <if test="supplierAddress != null and supplierAddress != ''">
+                supplier_address like '% +' #{supplierAddress} '+ %',
+            </if>
+            <if test="supplierType != null and supplierType != ''">
+                supplier_type = #{supplierType},
+            </if>
+            <if test="supplierState != null and supplierState != ''">
+                supplier_state = #{supplierState},
+            </if>
+            <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != '' ">
+                supplier_advance_purchase = #{supplierAdvancePurchase}
+            </if>
+        </where>
+    </select>
 </mapper>