FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_1' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-08-13 09:06:16 +08:00
parent 9f0ed13874 bfc9995aad
commit 3327223c25
11 changed files with 459 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+17 -9
View File
@@ -2,24 +2,26 @@
#============================================= #=============================================
# 数据库配置 # 数据库配置
#============================================= #=============================================
# dev config
#=============================================
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false #spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root spring.datasource.username = root
spring.datasource.password = root spring.datasource.password = root
#============================================== #==============================================
# 应用设置 # 应用设置
spring.application.name=FotonLAWSSystem spring.application.name=FotonLAWSSystem-zyh
application.code=20200101 application.code=20200101
application.center=1 application.center=1
#============================================== #==============================================
#Eruept #Eruept
eureka.client.allow-redirects=true eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
#============================================== #==============================================
# 邮箱配置1 # 邮箱配置1
@@ -44,10 +46,16 @@ spring.mail.port=587
#spring.rabbitmq.username=uat_pcms #spring.rabbitmq.username=uat_pcms
#spring.rabbitmq.password=VxsBLL5bJruwzXfS #spring.rabbitmq.password=VxsBLL5bJruwzXfS
# spring.rabbitmq.publisher-confirms=true # spring.rabbitmq.publisher-confirms=true
spring.rabbitmq.host=62.234.118.181
#spring.rabbitmq.host=192.168.10.248
#spring.rabbitmq.port=5672
#spring.rabbitmq.username=ca
#spring.rabbitmq.password=cs986432
spring.rabbitmq.host=localhost
spring.rabbitmq.port=5672 spring.rabbitmq.port=5672
spring.rabbitmq.username=admin spring.rabbitmq.virtual-host=/
spring.rabbitmq.password=admin spring.rabbitmq.username=guest
spring.rabbitmq.password=guest
# ============================================== # ==============================================
# 文档存储路径指向 # 文档存储路径指向
# ============================================== # ==============================================
adc-da-main/src/main/resources/application.properties
+3 -6
View File
@@ -1,6 +1,3 @@
##############################################
# 项目启动模式
##############################################
spring.profiles.active=dev spring.profiles.active=dev
############################################## ##############################################
@@ -39,7 +36,7 @@ eureka.client.fetch-registry=true
#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
# 请求连接的超时时间 默认的时间为 1 秒 # 请求连接的超时时间 默认的时间为 1 秒
ribbon.ConnectTimeout=500000 ribbon.ConnectTimeout=500000
@@ -137,13 +134,13 @@ file.path=D:/uploadfile/bus
# 文件下载地址参数 # 文件下载地址参数
file.downloadUrl=http://39.98.140.126:10001/uploadPath file.downloadUrl=http://39.98.140.126:10001/uploadPath
#上传文件白名单-以,分隔 #上传文件白名单-以,分隔
upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg
# ============================================================================= # =============================================================================
# elasticsearch 配置 # elasticsearch 配置
# ============================================================================= # =============================================================================
elasticsearch.clustername=elasticsearch elasticsearch.clustername=elasticsearch
elasticsearch.ip=172.17.0.1 elasticsearch.ip=192.168.10.47
elasticsearch.port=9300 elasticsearch.port=9300
elasticsearch.poolSize=5 elasticsearch.poolSize=5
elas.flag=true elas.flag=true
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java
+109 -56
View File
@@ -1,56 +1,109 @@
//package com.adc.da.slrs.sarStandPartCodeApply.controller; package com.adc.da.slrs.sarStandPartCodeApply.controller;
//
//import com.adc.da.base.web.BaseController; import com.adc.da.base.web.BaseController;
//import com.adc.da.http.ResponseMessage; import com.adc.da.http.ResponseMessage;
//import com.adc.da.http.Result; import com.adc.da.http.Result;
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply;
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage;
//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO;
//import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService;
//import com.baomidou.mybatisplus.core.metadata.IPage; import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController;
//import io.swagger.annotations.Api; import com.alibaba.excel.EasyExcel;
//import io.swagger.annotations.ApiOperation; import com.alibaba.fastjson.JSON;
//import org.slf4j.Logger; import com.baomidou.mybatisplus.core.metadata.IPage;
//import org.slf4j.LoggerFactory; import io.swagger.annotations.Api;
//import org.springframework.beans.factory.annotation.Autowired; import io.swagger.annotations.ApiOperation;
//import org.springframework.web.bind.annotation.PostMapping; import org.slf4j.Logger;
//import org.springframework.web.bind.annotation.RequestBody; import org.slf4j.LoggerFactory;
//import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*;
//
//import java.util.Date; import javax.servlet.http.HttpServletResponse;
//import java.util.List; import java.net.URLEncoder;
// import java.util.ArrayList;
//@RestController import java.util.Arrays;
//@Api(tags = "零部件编号申请") import java.util.Date;
//@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 import java.util.List;
//public class SarStandPartCodeApplyController extends BaseController<SarStandPartCodeApply> {
// @RestController
// //创建日志实例 @Api(tags = "零部件编号申请", value = "SarStandPartCodeApplyController", description = "零部件编号申请控制类")
// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); @RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口
// public class SarStandPartCodeApplyController extends BaseController<SarStandPartCodeApply> {
// @Autowired
// private ISarStandPartCodeApplyService sarStandPartCodeApplyService; //创建日志实例
// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
// @ApiOperation("零部件编号申请新增")
// @PostMapping("/add") @Autowired
// public ResponseMessage<Object> add(@RequestBody List<SarStandPartCodeApply> sarStandPartCodeApply){ private ISarStandPartCodeApplyService sarStandPartCodeApplyService;
// sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date()));
// if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)){ @ApiOperation("零部件编号申请新增")
// return Result.success("新增成功"); @PostMapping("/add")
// } public ResponseMessage<Object> add(@RequestBody List<SarStandPartCodeApply> sarStandPartCodeApply) {
// else { sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date()));
// return Result.error("新增失败"); if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)) {
// } return Result.success("新增成功");
// } } else {
// return Result.error("新增失败");
// /** }
// * 分页查询零部件 }
// * @param sarStandPartCodeApplyPage: 筛选、分页信息
// * @return IPage<SarStandPartCodeApply> /**
// */ * 分页查询零部件
// public ResponseMessage<IPage<SarStandPartCodeApply>> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ *
// IPage<SarStandPartCodeApply> sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); * @param sarStandPartCodeApplyPage: 筛选、分页信息
// return Result.success(sarStandPartCodeApplyIPage); * @return IPage<SarStandPartCodeApply>
// } */
//} @ApiOperation("分页查询零部件")
@GetMapping
public ResponseMessage<IPage<SarStandPartCodeApply>> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage) {
IPage<SarStandPartCodeApply> sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage);
return Result.success(sarStandPartCodeApplyIPage);
}
/**
* 批量删除零部件
*
* @param idList
* @return
*/
@ApiOperation(value = "批量删除零部件")
@PostMapping("/deleteListAll")
public ResponseMessage deleteListAll(String[] idList) {
if (idList == null || idList.length == 0) {
return Result.success("200", "要删除的数据为空");
} else {
List<String> list = new ArrayList<>(Arrays.asList(idList));
String src = sarStandPartCodeApplyService.del(list);
return Result.success("200", src);
}
}
@ApiOperation("导出Excel表")
@GetMapping(value = "exportPartInfoExcel")
public void exportPartInfoExcel(StandPartCodeExcelVO standPartCodeExcelVO, HttpServletResponse response) throws Exception {
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
if (standPartCodeExcelVO.getExportName() == null) {
standPartCodeExcelVO.setExportName("零部件申请信息");
}
String fileName = URLEncoder.encode(standPartCodeExcelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
List<SarStandPartCodeApply> data = sarStandPartCodeApplyService.getPartInfoExcelData(standPartCodeExcelVO);
//这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), SarStandPartCodeApply.class).autoCloseStream(Boolean.FALSE)
.sheet("sheet1").doWrite(data);
} catch (Exception e) {
System.out.println(e);
//重置response
response.reset();
response.setContentType("application/json");
response.setCharacterEncoding("utf-8");
response.getWriter().println(JSON.toJSONString(Result.error()));
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java
+15 -15
View File
@@ -1,15 +1,15 @@
//package com.adc.da.slrs.sarStandPartCodeApply.dao; package com.adc.da.slrs.sarStandPartCodeApply.dao;
//
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply;
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage;
//import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
//import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
//
//@Mapper @Mapper
//public interface SarStandPartCodeApplyDao extends BaseMapper<SarStandPartCodeApply> { public interface SarStandPartCodeApplyDao extends BaseMapper<SarStandPartCodeApply> {
// IPage<SarStandPartCodeApply> getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); IPage<SarStandPartCodeApply> getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply);
//
//} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java
+84 -84
View File
@@ -1,84 +1,84 @@
//package com.adc.da.slrs.sarStandPartCodeApply.entity; package com.adc.da.slrs.sarStandPartCodeApply.entity;
//
//import com.adc.da.base.entity.BaseEntity; import com.adc.da.base.entity.BaseEntity;
//import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
//import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
//import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
//import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
//import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
//import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
//import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
//import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
//import lombok.Data; import lombok.Data;
//import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
//import lombok.experimental.Accessors; import lombok.experimental.Accessors;
//import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
//
//import java.util.Date; import java.util.Date;
//
//@Data @Data
//@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
//@Accessors(chain = true) @Accessors(chain = true)
//@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") @ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性")
//public class SarStandPartCodeApply extends BaseEntity { public class SarStandPartCodeApply extends BaseEntity {
//
// //版本号 //版本号
// private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
//
// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里
// @ApiModelProperty(value = "主键")//接口标志 @ApiModelProperty(value = "主键")//接口标志
// @TableId(type = IdType.UUID)//数据库表里的主键 @TableId(type = IdType.UUID)//数据库表里的主键
// private String id; private String id;
//
// @ExcelProperty("子组号")//Excel里的表头显示的是什么 @ExcelProperty("子组号")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "子组号")//接口标志 @ApiModelProperty(value = "子组号")//接口标志
// @TableField("SUBGROUP_NUMBER")//数据库表里的字段 @TableField("SUBGROUP_NUMBER")//数据库表里的字段
// private String subgroupNumber; private String subgroupNumber;
//
// @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 @ExcelProperty("子组结构号")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "子组结构号")//接口标志 @ApiModelProperty(value = "子组结构号")//接口标志
// @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段
// private String subgroupStructureNumber; private String subgroupStructureNumber;
//
// @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "子组结构名称")//接口标志 @ApiModelProperty(value = "子组结构名称")//接口标志
// @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段
// private String subgroupStructureName; private String subgroupStructureName;
//
// @ExcelProperty("分组代号")//Excel里的表头显示的是什么 @ExcelProperty("分组代号")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "分组代号")//接口标志 @ApiModelProperty(value = "分组代号")//接口标志
// @TableField("GROUP_CODE")//数据库表里的字段 @TableField("GROUP_CODE")//数据库表里的字段
// private String groupCode; private String groupCode;
//
// @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "零部件分类名称")//接口标志 @ApiModelProperty(value = "零部件分类名称")//接口标志
// @TableField("PART_CATEGORY_NAME")//数据库表里的字段 @TableField("PART_CATEGORY_NAME")//数据库表里的字段
// private String partCategoryName; private String partCategoryName;
//
// @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "零部件分类代号")//接口标志 @ApiModelProperty(value = "零部件分类代号")//接口标志
// @TableField("PART_CATEGORY_CODE")//数据库表里的字段 @TableField("PART_CATEGORY_CODE")//数据库表里的字段
// private String partCategoryCode; private String partCategoryCode;
//
// @ExcelProperty("备注")//Excel里的表头显示的是什么 @ExcelProperty("备注")//Excel里的表头显示的是什么
// @ApiModelProperty(value = "备注")//接口标志 @ApiModelProperty(value = "备注")//接口标志
// @TableField("REMARKS")//数据库表里的字段 @TableField("REMARKS")//数据库表里的字段
// private String remarks; private String remarks;
//
// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里
// @ApiModelProperty(value = "创建部门")//接口标志 @ApiModelProperty(value = "创建部门")//接口标志
// @TableField("CREATE_DEPT_ID")//数据库表里的字段 @TableField("CREATE_DEPT_ID")//数据库表里的字段
// private String createDeptId; private String createDeptId;
//
// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里
// @ApiModelProperty(value = "创建人")//接口标志 @ApiModelProperty(value = "创建人")//接口标志
// @TableField("CREATE_BY_ID")//数据库表里的字段 @TableField("CREATE_BY_ID")//数据库表里的字段
// private String createById; private String createById;
//
// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里
// @ApiModelProperty(value = "创建时间")//接口标志 @ApiModelProperty(value = "创建时间")//接口标志
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化
// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化
// @TableField("CREATE_TIME")//数据库表里的字段 @TableField("CREATE_TIME")//数据库表里的字段
// private Date createTime; private Date createTime;
//} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java
+51 -51
View File
@@ -1,51 +1,51 @@
//package com.adc.da.slrs.sarStandPartCodeApply.entity; package com.adc.da.slrs.sarStandPartCodeApply.entity;
//
//import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
//import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
//import lombok.Data; import lombok.Data;
//
//import java.sql.Timestamp; import java.sql.Timestamp;
//
//@Data @Data
//@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") @ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息")
//public class SarStandPartCodeApplyPage { public class SarStandPartCodeApplyPage {
//
// @ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
// private String id; private String id;
//
// @ApiModelProperty(value = "子组号") @ApiModelProperty(value = "子组号")
// private String subgroupNumber; private String subgroupNumber;
//
// @ApiModelProperty(value = "子组结构号") @ApiModelProperty(value = "子组结构号")
// private String subgroupStructureNumber; private String subgroupStructureNumber;
//
// @ApiModelProperty(value = "子组结构名称") @ApiModelProperty(value = "子组结构名称")
// private String subgroupStructureName; private String subgroupStructureName;
//
// @ApiModelProperty(value = "分组代号") @ApiModelProperty(value = "分组代号")
// private String groupCode; private String groupCode;
//
// @ApiModelProperty(value = "零部件分类名称") @ApiModelProperty(value = "零部件分类名称")
// private String partCategoryName; private String partCategoryName;
//
// @ApiModelProperty(value = "零部件分类代号") @ApiModelProperty(value = "零部件分类代号")
// private String partCategoryCode; private String partCategoryCode;
//
// @ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
// private String remarks; private String remarks;
//
// @ApiModelProperty(value = "创建部门") @ApiModelProperty(value = "创建部门")
// private String createDeptId; private String createDeptId;
//
// @ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
// private String createById; private String createById;
//
// @ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
// private Timestamp createTime; private Timestamp createTime;
//
// @ApiModelProperty("当前页") @ApiModelProperty("当前页")
// private Integer current; private Integer current;
//
// @ApiModelProperty("每页条数") @ApiModelProperty("每页条数")
// private Integer size; private Integer size;
//} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java
+16
View File
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarStandPartCodeApply.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel(description = "零部件申请ExcelVO类")
public class StandPartCodeExcelVO {
@ApiModelProperty("文件名")
String exportName;
@ApiModelProperty("导出的零部件ID列表")
List<String> ids;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java
+33 -16
View File
@@ -1,16 +1,33 @@
//package com.adc.da.slrs.sarStandPartCodeApply.service; package com.adc.da.slrs.sarStandPartCodeApply.service;
//
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply;
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage;
//import com.baomidou.mybatisplus.core.metadata.IPage; import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO;
//import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage;
// import com.baomidou.mybatisplus.extension.service.IService;
//public interface ISarStandPartCodeApplyService extends IService<SarStandPartCodeApply> {
// import java.util.List;
// /**
// * 分页查询零部件 public interface ISarStandPartCodeApplyService extends IService<SarStandPartCodeApply> {
// * @param sarStandPartCodeApplyPage: 筛选、分页信息
// * @return: IPage<SarStandPartCodeApply> /**
// */ * 分页查询零部件
// IPage<SarStandPartCodeApply> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); * @param sarStandPartCodeApplyPage: 筛选、分页信息
//} * @return: IPage<SarStandPartCodeApply>
*/
IPage<SarStandPartCodeApply> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage);
/**
* 批量删除零件申请信息
* @param idList
* @return
*/
String del(List<String> idList);
/**
* 获取导出Excel的数据
* @param standPartCodeExcelVO: ids
* @return List<SarStandPartCodeApply>
*/
List<SarStandPartCodeApply> getPartInfoExcelData(StandPartCodeExcelVO standPartCodeExcelVO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java
+91 -35
View File
@@ -1,35 +1,91 @@
//package com.adc.da.slrs.sarStandPartCodeApply.service.impl; package com.adc.da.slrs.sarStandPartCodeApply.service.impl;
//
//import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao;
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply;
//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage;
//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO;
//import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService;
//import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
//import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
//import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
//import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired;
// import org.springframework.stereotype.Service;
//import javax.annotation.Resource;
//import java.util.List; import javax.annotation.Resource;
// import java.util.List;
//@Service
//public class SarStandPartCodeApplyServiceImpl extends ServiceImpl<SarStandPartCodeApplyDao, SarStandPartCodeApply> implements ISarStandPartCodeApplyService { @Service
// public class SarStandPartCodeApplyServiceImpl extends ServiceImpl<SarStandPartCodeApplyDao, SarStandPartCodeApply> implements ISarStandPartCodeApplyService {
// @Autowired
// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; @Autowired
// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao;
// @Resource
// private SarStandardsInfoDao sarStandardsInfoDao; @Resource
// private SarStandardsInfoDao sarStandardsInfoDao;
// public IPage<SarStandPartCodeApply> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){
// QueryWrapper<SarStandPartCodeApply> sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); /**
// if (sarStandPartCodeApplyQueryWrapper.) * 分页查询零部件信息
// } * @param sarStandPartCodeApplyPage: 筛选、分页信息
// * @return :IPage<SarStandPartCodeApply>
// */
//} @Override
public IPage<SarStandPartCodeApply> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){
QueryWrapper<SarStandPartCodeApply> sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>();
//根据子组号查询
if (sarStandPartCodeApplyPage.getSubgroupNumber() != null){
sarStandPartCodeApplyQueryWrapper.like("SUBGROUP_NUMBER",sarStandPartCodeApplyPage.getSubgroupNumber());
}
//根据分组代号查询
if (sarStandPartCodeApplyPage.getGroupCode() != null){
sarStandPartCodeApplyQueryWrapper.like("GROUP_CODE",sarStandPartCodeApplyPage.getGroupCode());
}
//根据零件分类代号查询
if (sarStandPartCodeApplyPage.getPartCategoryCode() != null){
sarStandPartCodeApplyQueryWrapper.like("PART_CATEGORY_CODE",sarStandPartCodeApplyPage.getPartCategoryCode());
}
Page<SarStandPartCodeApply> standPartCodeApplyPage=new Page<>();
//判断前端是否提供页码和每页条数
if (sarStandPartCodeApplyPage.getCurrent()!=null && sarStandPartCodeApplyPage.getSize()!=null){
standPartCodeApplyPage = new Page<>(sarStandPartCodeApplyPage.getCurrent(),sarStandPartCodeApplyPage.getSize());
}
return sarStandPartCodeApplyDao.selectPage(standPartCodeApplyPage,sarStandPartCodeApplyQueryWrapper);
}
/**
* 批量删除零部件信息
* @param idList: 批量删除的id数组
* @return
*/
@Override
public String del(List<String> idList){
QueryWrapper<SarStandPartCodeApply> wrapper = new QueryWrapper<>();
for (String id: idList) {
wrapper.eq("ID",id);
sarStandPartCodeApplyDao.delete(wrapper);
}
sarStandPartCodeApplyDao.deleteBatchIds(idList);
return "删除成功";
}
/**
* 获取导出excel的数据
* @param standPartCodeExcelVO: ids
* @return List<SarStandPartCodeApply>
*/
@Override
public List<SarStandPartCodeApply> getPartInfoExcelData(StandPartCodeExcelVO standPartCodeExcelVO){
QueryWrapper<SarStandPartCodeApply> sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>();
if (standPartCodeExcelVO.getIds()!=null && standPartCodeExcelVO.getIds().size()>0){
sarStandPartCodeApplyQueryWrapper.in("id",standPartCodeExcelVO.getIds());
}
List<SarStandPartCodeApply> stand = sarStandPartCodeApplyDao.selectList(sarStandPartCodeApplyQueryWrapper);
List<SarStandPartCodeApply> a = stand;
return a;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
+4
View File
@@ -91,6 +91,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
@ApiModelProperty(value = "在产产品合规信息") @ApiModelProperty(value = "在产产品合规信息")
private String productionCompliance; private String productionCompliance;
@ApiModelProperty(value = "在产产品不合规信息")
@TableField("production_non_compliance")
private String productionNonCompliance;
@ApiModelProperty(value = "在产产品不合规应对措施") @ApiModelProperty(value = "在产产品不合规应对措施")
private String productionCountermeasures; private String productionCountermeasures;
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+36 -36
View File
@@ -73,17 +73,17 @@
<!-- SAR_STAND_ITEMS table all fields --> <!-- SAR_STAND_ITEMS table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps,
SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo
</sql> </sql>
<sql id="Base_Query_Column_List"> <sql id="Base_Query_Column_List">
SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit,
SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps,
SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,SAR_STAND_ITEMS.fo SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,SAR_STAND_ITEMS.fo
</sql> </sql>
<!-- 查询条件 --> <!-- 查询条件 -->
<sql id="Base_Where_Clause"> <sql id="Base_Where_Clause">
@@ -194,11 +194,11 @@
<!-- 插入记录 --> <!-- 插入记录 -->
<!--<insert id="insert" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" >--> <!--<insert id="insert" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" >-->
<!--&lt;!&ndash; <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">--> <!--&lt;!&ndash; <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">-->
<!--SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL--> <!--SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL-->
<!--</selectKey> &ndash;&gt;--> <!--</selectKey> &ndash;&gt;-->
<!--insert into SAR_STAND_ITEMS(<include refid="Base_Column_List" />)--> <!--insert into SAR_STAND_ITEMS(<include refid="Base_Column_List" />)-->
<!--values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})--> <!--values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})-->
<!--</insert>--> <!--</insert>-->
<!-- 动态插入记录 主键是序列 --> <!-- 动态插入记录 主键是序列 -->
@@ -262,22 +262,22 @@
<!-- 根据pk，修改记录--> <!-- 根据pk，修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
update SAR_STAND_ITEMS update SAR_STAND_ITEMS
set modify_time = #{modifyTime}, set modify_time = #{modifyTime},
creation_time = #{creationTime}, creation_time = #{creationTime},
creation_user = #{creationUser}, creation_user = #{creationUser},
valid_flag = #{validFlag}, valid_flag = #{validFlag},
remarks = #{remarks}, remarks = #{remarks},
responsible_unit = #{responsibleUnit}, responsible_unit = #{responsibleUnit},
energy_kind = #{energyKind}, energy_kind = #{energyKind},
apply_arctic = #{applyArctic}, apply_arctic = #{applyArctic},
tack_time = #{tackTime}, tack_time = #{tackTime},
parts = #{parts}, parts = #{parts},
items_name = #{itemsName}, items_name = #{itemsName},
items_num = #{itemsNum}, items_num = #{itemsNum},
stand_id = #{standId} stand_id = #{standId}
where id = #{id} where id = #{id}
</update> </update>
<!-- 修改记录，只修改只不为空的字段 --> <!-- 修改记录，只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
@@ -362,10 +362,10 @@
<!-- 删除记录 --> <!-- 删除记录 -->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String"> <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from SAR_STAND_ITEMS delete from SAR_STAND_ITEMS
where id = #{value} where id = #{value}
</delete> </delete>
<!-- SAR_STAND_ITEMS 列表总数--> <!-- SAR_STAND_ITEMS 列表总数-->
<select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
@@ -375,10 +375,10 @@
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap" <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO"> parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
SELECT SELECT
* *
FROM FROM
sar_stand_items AS a sar_stand_items AS a
<where> <where>
<if test="standId!=null and standId!=''"> <if test="standId!=null and standId!=''">
@@ -386,7 +386,7 @@
</if> </if>
<if test="fileType !=null and fileType!=''"> <if test="fileType !=null and fileType!=''">
and a.file_type=#{fileType} and a.file_type=#{fileType}
</if> </if>
<if test="itemsName != null and itemsName!=''"> <if test="itemsName != null and itemsName!=''">
@@ -741,10 +741,10 @@
a.STAND_ID a.STAND_ID
FROM FROM
sar_stand_items a sar_stand_items a
LEFT JOIN sar_standards_info b LEFT JOIN sar_standards_info b
on a.STAND_ID=b.ID on a.STAND_ID=b.ID
WHERE b.VALID_FLAG = 0 WHERE b.VALID_FLAG = 0
and a.FILE_TYPE ='FBGBJBD' and a.FILE_TYPE ='FBGBJBD'
GROUP BY GROUP BY
a.STAND_ID a.STAND_ID
limit #{page},#{size} limit #{page},#{size}