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_master_bak' into dev_wxh_bak

Browse Source
This commit is contained in:
super_liu
2021-10-09 14:27:14 +08:00
parent 81c44413fe 4def3bfe68
commit 2ec4db856a
18 changed files with 122 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+4 -1
View File
@@ -17,8 +17,11 @@ import java.util.Set;
//@FeignClient(value = "shan6")
public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET)
Map<String,Object> execTask(@RequestParam("todoId") String todoId);
@RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET)
long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId);
Map<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId);
@RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)
Wrapper<String> activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId);
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+7 -2
View File
@@ -25,8 +25,13 @@ public class workFlowFeignClientImpl {
@Autowired
private IUserEOService userEOService;
public long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
long stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId);
public Map<String,Object> execTask(@RequestParam("todoId") String todoId){
Map<String,Object> stringWrapper = workFlowFeignClient.execTask(todoId);
return stringWrapper;
}
public Map<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
Map<String,Object> stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId);
return stringWrapper;
}
adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java
+2
View File
@@ -44,5 +44,7 @@ public class BusProcessNew {
private String finishFlag;
private long commitStatus;
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+13 -6
View File
@@ -35,10 +35,8 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/${restPath}/lawss/activiti")
@@ -51,9 +49,15 @@ public class WorkFlowController {
// @Autowired
// private ExportExcelMapper exportExcelMapper;
@ApiOperation(value = "干活流程接收待办")
@GetMapping("/execTask")
public Map<String,Object> execTask(@RequestParam("todoId") String todoId){
return workFlowFeignClient.execTask(todoId);
}
@ApiOperation(value = "流程实例明细验证是否完成")
@GetMapping("/get_verify_by_instance")
public long activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
public Map<String,Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
return workFlowFeignClient.get_verify_by_instance(taskId,pId);
}
@@ -68,8 +72,11 @@ public class WorkFlowController {
if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){
exportExcelEO.setFileName(UUID.fastUUID().toString(true));
}
List<Map<String, Object>> dataList = exportExcelEO.getDataList().stream()
.sorted(Comparator.comparing(a -> String.valueOf(a.get("chapterNumber").toString())))
.collect(Collectors.toList());
Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), exportExcelEO.getDataList(), null, exportExcelEO.getFileName());
Workbook excel = TableToExcel.createExcel(exportExcelEO.getColumnName(), dataList, null, exportExcelEO.getFileName());
response.reset();
adc-da-main/src/main/resources/application-dev.properties
+6 -2
View File
@@ -4,7 +4,7 @@
#=============================================
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://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
#spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = root
@@ -49,6 +49,10 @@ spring.rabbitmq.port=5672
spring.rabbitmq.username=guest
spring.rabbitmq.password=guest
spring.rabbitmq.listener.simple.acknowledge-mode= manual
# 生产者 默认关闭 发版 需改为 true
spring.rabbitmq.listener.direct.auto-startup=false
# 消费者 默认关闭 发版 需改为 true
spring.rabbitmq.listener.simple.auto-startup=false
#消费失败消息干掉
spring.rabbitmq.listener.simple.default-requeue-rejected= true
#5秒
@@ -70,7 +74,7 @@ OCR.userId =dayuzhou1234
OCR.authCode =123456
OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M
# OCR文件存储路径
OCR.ocrPath=/opt/foton-slrs/front/dist/file/
OCR.ocrPath=/opt/foton-slrs/front/dist/file/a
# OCR文件请求下载或在线预览时URL
OCR.ocrDownPath=http://62.234.136.153:8038/file/
OCR.times=20
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java
+13 -13
View File
@@ -48,66 +48,66 @@ public class LawsDto {
private String NYLX;
@ApiModelProperty(value = "标准年份")
@ExcelProperty(value = "标准年份", index = 5)
// @ExcelProperty(value = "标准年份", index = 5)
private String standYear;
@ApiModelProperty(value = "标准类别")
@ExcelProperty(value = "标准类别", index = 6)
// @ExcelProperty(value = "标准类别", index = 6)
private String standSortShow;
@ApiModelProperty(value = "标准发表日期")
@ExcelProperty(value = "标准发表日期", index = 7)
// @ExcelProperty(value = "标准发表日期", index = 7)
private String issueTime;
@ColumnWidth(16)
@ExcelProperty(value = "标准实施日期", index = 8)
@ExcelProperty(value = "标准实施日期", index = 5)
@ApiModelProperty(value = "标准实施日期")
@DateTimeFormat("yyyy年MM月dd日")
private String SSRQ;
@ColumnWidth(16)
@ExcelProperty(value = "新车型实施日期", index = 9)
@ExcelProperty(value = "新车型实施日期", index = 6)
@ApiModelProperty(value = "新车型实施日期")
@DateTimeFormat("yyyy年MM月dd日")
private String XCXSSRQGJ;
@ColumnWidth(16)
@ExcelProperty(value = "在产车实施日期", index = 10)
@ExcelProperty(value = "在产车实施日期", index = 7)
@ApiModelProperty(value = "在产车实施日期")
@DateTimeFormat("yyyy年MM月dd日")
private String ZCCSSRQGJ;
@ExcelProperty(value = "责任部门", index = 11)
@ExcelProperty(value = "责任部门", index = 8)
@ApiModelProperty(value = "责任部门")
private String ZRBM;
@ColumnWidth(14)
@ExcelProperty(value = "适用产品线", index = 12)
@ExcelProperty(value = "适用产品线", index = 9)
@ApiModelProperty(value = "适用产品线")
private String SYCPX;
@ColumnWidth(20)
@ExcelProperty(value = "乘用车VPPS编码", index = 13)
@ExcelProperty(value = "乘用车VPPS编码", index = 10)
@ApiModelProperty(value = "乘用车VPPS编码")
private String CYCVPPSBM;
@ColumnWidth(20)
@ExcelProperty(value = "乘用车vpps中文名称", index = 14)
@ExcelProperty(value = "乘用车vpps中文名称", index = 11)
@ApiModelProperty(value = "乘用车vpps中文名称")
private String CYCVPPSCN;
@ColumnWidth(20)
@ExcelProperty(value = "卡车VPPS编码", index = 15)
@ExcelProperty(value = "卡车VPPS编码", index = 12)
@ApiModelProperty(value = "卡车VPPS编码")
private String KCCVPPSBM;
@ColumnWidth(20)
@ExcelProperty(value = "卡车vpps中文名称", index = 16)
@ExcelProperty(value = "卡车vpps中文名称", index = 13)
@ApiModelProperty(value = "卡车vpps中文名称")
private String KCCVPPSCN;
@ApiModelProperty(value = "责任工程师")
@ExcelProperty(value = "责任工程师", index = 17)
// @ExcelProperty(value = "责任工程师", index = 17)
private String responsibleEngineer;
@ApiModelProperty(value = "1")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+1
View File
@@ -104,6 +104,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
if (!StringUtils.isEmpty(cid)){
QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
wrapper.eq(SarPublicIdeaAll.CID,cid);
wrapper.orderByAsc("part_code");
data=sarPublicIdeaAllDao.selectList(wrapper);
}
List<GetExcelDto> standExcel=new ArrayList<>();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+1 -2
View File
@@ -8,7 +8,6 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
@@ -56,7 +55,7 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
@ApiOperation(value = "分解单查询")
@GetMapping("/querySarItemAndInterpretation")
public ResponseMessage<PageInfo<SarStandItems>> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
List<SarStandItems> rows = ServiceImpl.querySarItemAndInterpretation(page);
PageInfo<SarStandItems> pageInfo = getPageInfo(page.getPager(), rows);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
+3
View File
@@ -13,6 +13,9 @@ import java.util.Date;
public class FindSarItemsPageReqDTO extends BasePage {
private static final long serialVersionUID = 1L;
private Integer page = 1;
private Integer pageSize = 20;
@ApiModelProperty(value = "标准id")
private String standId;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java
+6 -1
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarStandItems.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -22,9 +23,13 @@ public class SarStandItemsDto {
@ApiModelProperty(value = "条目编号")
private String itemsNum;
@ApiModelProperty(value = "内容")
@ApiModelProperty(value = "名称")
private String itemsName;
@ApiModelProperty(value = "内容")
@TableField("TERMS_CONDITIONS")
private String termsConditions;
@ApiModelProperty(value = "责任部门")
private String responsibleUnit;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+29 -24
View File
@@ -36,7 +36,12 @@ public class SarStandUnqualified extends BaseEntity {
private static final long serialVersionUID = 1L;
@ExcelProperty("标准ID")
@ExcelProperty("标准号")
@ApiModelProperty(value = "标准编号")
@TableField("STAND_SERIAL_NUMBER")
private String standSerialNumber;
@ExcelIgnore
@ApiModelProperty(value = "标准ID")
@TableField("STAND_ID")
private String standId;
@@ -69,27 +74,27 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("ITEMS_NAME")
private String itemsName;
@ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
@ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
@TableField("PRODUCT_TYPE")
private String productType;
@ExcelProperty("产品线")
@ApiModelProperty(value = "产品线")
@TableField("PRODUCT_LINE")
private String productLine;
@ExcelProperty("责任部门")
@ApiModelProperty(value = "责任部门")
@TableField("RESPONSIBLE_UNIT")
private String responsibleUnit;
@ExcelProperty("项目名称")
@ApiModelProperty(value = "项目名称")
@TableField("PRODUCT_NAME")
private String productName;
@ExcelProperty("创建部门")
@ExcelIgnore
@ApiModelProperty(value = "创建部门")
@TableField("CREATE_DEPT_ID")
private String createDeptId;
@ExcelProperty("创建人")
@ExcelIgnore
@ApiModelProperty(value = "创建人")
@TableField("CREATE_BY_ID")
private String createById;
@@ -113,17 +118,16 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("ACTUAL_CLOSE_TIME")
private Date actualCloseTime;
@ExcelIgnore
@ApiModelProperty(value = "计划关闭时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("PLAN_CLOSE_TIME")
private Date planCloseTime;
@ExcelProperty("不合规项目")
@ApiModelProperty(value = "未符合原因")
@TableField("REASON")
private String reason;
@ExcelProperty("责任部门")
@ApiModelProperty(value = "责任部门")
@TableField("RESPONSIBLE_UNIT")
private String responsibleUnit;
@ExcelProperty("质量工程师")
@ApiModelProperty(value = "质量工程师")
@TableField("QA_ENGINEER")
@@ -139,33 +143,34 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("DUTY_ENGINEER")
private String dutyEngineer;
@ExcelProperty("标准编号")
@ApiModelProperty(value = "标准编号")
@TableField("STAND_SERIAL_NUMBER")
private String standSerialNumber;
@ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
@ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
@TableField("PRODUCT_TYPE")
private String productType;
@ExcelProperty("计划关闭时间")
@ApiModelProperty(value = "计划关闭时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("PLAN_CLOSE_TIME")
private Date planCloseTime;
@ExcelIgnore
@ApiModelProperty(value = "主键")
@TableId(type = IdType.UUID)
private String id;
@ExcelIgnore
@ApiModelProperty(value = "质量工程师")
@TableField(exist=false)
private String qaEngineerName;
@ExcelIgnore
@ApiModelProperty(value = "认证工程师")
@TableField(exist=false)
private String authEngineerName;
@ExcelIgnore
@ApiModelProperty(value = "责任工程师")
@TableField(exist=false)
private String dutyEngineerName;
@ExcelIgnore
@ApiModelProperty(value = "国内OR海外")
@TableField(exist=false)
private String standType;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+4 -1
View File
@@ -218,7 +218,10 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
int result = sarStandardsInfoEOService.deleteSarStandards(ids);
if (result > 0) {
return Result.success("0", "删除成功", result);
} else {
}else if(result == -1) {
return Result.success("-1","所选的标准下挂有标准，无法删除");
}
else {
return Result.error("删除失败");
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+21
View File
@@ -15,6 +15,8 @@ import com.adc.da.search.entity.StandLawsEO;
import com.adc.da.search.service.StandLawsSearchService;
import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList;
import com.adc.da.slrs.sarLawsAttrDetailedList.service.impl.SarLawsAttrDetailedListServiceImpl;
import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
@@ -1285,13 +1287,32 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
@Autowired
SarLawsAttrDetailedListServiceImpl detailedListService;
public int deleteSarStandards(String ids) {
QueryWrapper<SarLawsAttrDetailedList> detailedListQueryWrapper = new QueryWrapper<>();
String[] idArr = ids.split(",");
SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
sarStandardsInfoEO.setValidFlag("1");
sarStandardsInfoEO.setModifyTime(new Date());
int countResult = 0;
//如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准
for (String id : idArr){
detailedListQueryWrapper.eq("stand_id",id);
int count = detailedListService.count(detailedListQueryWrapper);
if (count>0){
countResult = -1;
return countResult;
}
}
for (String id : idArr) {
countResult++;
//查询删除的标准信息（为删除代替关系）
SarStandardsInfo getDelStandInfoList = dao.selectById(id);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
Page<TsUser> tsUserPage = new Page<>();
System.out.println(tsUser.getCurrent());
System.out.println(tsUser.getSize());
List<TsUser> tsUserList = tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),1*tsUser.getSize(),tsUser);
List<TsUser> tsUserList = tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser);
Integer total = tsUserDao.getUserAndPositionCount(tsUser);
tsUserPage.setRecords(tsUserList);
tsUserPage.setCurrent(tsUser.getCurrent());
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java
+1 -1
View File
@@ -253,7 +253,7 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
if(null!=sarFileSplitInfoEO){
sarFileSplitInfoEO.setModifyTime(new Date());
if (null==sarFileSplitInfoEO.getSplitStatus())
sarFileSplitInfoEO.setSplitStatus("0");
sarFileSplitInfoEO.setSplitStatus("1");
sarFileSplitInfoEOService.updateByPrimaryKeySelective(sarFileSplitInfoEO);
return Result.success("0","编辑成功",null);
}else{
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class FieldConvertUtil {
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用认证,能源类型," +
"文本状态,发布日期,是否纳入认证清单,体系类别,标签,适用认证,能源类型," +
"关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+3
View File
@@ -413,6 +413,9 @@
<!-- 标准名称 -->
<if test="standName != null and standName != ''">
and stand_name like concat(concat('%',#{standName}),'%')
or STAND_NUMBER like concat(concat('%',#{standName}),'%')
or STAND_YEAR like concat(concat('%',#{standName}),'%')
or STAND_SORT like concat(concat('%',#{standName}),'%')
</if>
<if test="standEnName != null and standEnName != ''">
and stand_en_name like concat(concat('%',#{standEnName}),'%')
adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+6
View File
@@ -51,6 +51,12 @@
left join ts_position p
on up.position_id=p.id
where u.institution_id=#{TsUser.institutionId}
<if test="TsUser.uname != null and TsUser.uname != '' ">
and u.uname like concat('%',#{TsUser.uname},'%')
</if>
<if test="TsUser.email != null and TsUser.email != '' ">
and u.email like concat('%',#{TsUser.email},'%')
</if>
</select>
<select id="getUserIdsByPositionIds" resultType="String">