Merge remote-tracking branch 'origin/develop_master' into develop_1
This commit is contained in:
zzy
+23
@@ -0,0 +1,23 @@
|
||||
package com.adc.da.slrs.sarBussionessStand.controller;
|
||||
|
||||
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.adc.da.base.web.BaseController;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 企业标准信息表 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-13
|
||||
*/
|
||||
@RestController
|
||||
@Api(tags = "福田标准法规--企业标准信息")
|
||||
@RequestMapping("/${restPath}/lawss/sarBussionessStand")
|
||||
public class SarBussionessStandController extends BaseController<SarBussionessStand> {
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.sarBussionessStand.dao;
|
||||
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 企业标准信息表 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-13
|
||||
*/
|
||||
public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
|
||||
|
||||
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
|
||||
}
|
||||
+186
@@ -0,0 +1,186 @@
|
||||
package com.adc.da.slrs.sarBussionessStand.entity;
|
||||
|
||||
import com.adc.da.att.vo.AttFileVo;
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 企业标准信息表
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-13
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarBussionessStand对象", description="企业标准信息表")
|
||||
public class SarBussionessStand extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "主键")
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "标准编号")
|
||||
@TableField("STAND_CODE")
|
||||
private String standCode;
|
||||
|
||||
@ApiModelProperty(value = "标准名称")
|
||||
@TableField("STAND_NAME")
|
||||
private String standName;
|
||||
|
||||
@ApiModelProperty(value = "标准英文名称")
|
||||
@TableField("STAND_EN_NAME")
|
||||
private String standEnName;
|
||||
|
||||
@ApiModelProperty(value = "发布日期")
|
||||
@TableField("ISSUE_TIME")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
private Date issueTime;
|
||||
|
||||
@ApiModelProperty(value = "实施日期")
|
||||
@TableField("PUT_TIME")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
private Date putTime;
|
||||
|
||||
@ApiModelProperty(value = "代替标准号")
|
||||
@TableField("REPLACE_STAND_NUM")
|
||||
private String replaceStandNum;
|
||||
|
||||
@ApiModelProperty(value = "被代替标准号")
|
||||
@TableField("REPLACED_STAND_NUM")
|
||||
private String replacedStandNum;
|
||||
|
||||
@ApiModelProperty(value = "标准状态")
|
||||
@TableField("STAND_STATUS")
|
||||
private String standStatus;
|
||||
|
||||
@ApiModelProperty(value = "适用国家/地区")
|
||||
@TableField("APPLY_COUNTRY")
|
||||
private String applyCountry;
|
||||
|
||||
@ApiModelProperty(value = "标准性质")
|
||||
@TableField("STAND_NATURE")
|
||||
private String standNature;
|
||||
|
||||
@ApiModelProperty(value = "标准类别")
|
||||
@TableField("STAND_SORT")
|
||||
private String standSort;
|
||||
|
||||
@ApiModelProperty(value = "标准年份")
|
||||
@TableField("STAND_YEAR")
|
||||
private String standYear;
|
||||
|
||||
@ApiModelProperty(value = "是否有效")
|
||||
@TableField("VALID_FLAG")
|
||||
private Integer validFlag;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@TableField("CREATION_TIME")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date creationTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
@TableField("MODIFY_TIME")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date modifyTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String firstPutTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
private String putTimeShow;
|
||||
|
||||
@TableField(exist = false)
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
private String issueTimeShow;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String issueTimeStr;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String putTimeStr;
|
||||
|
||||
//目录ID 非标准信息表中的字段
|
||||
@TableField(exist = false)
|
||||
private String menuId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String menuParentId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String standStatusShow; // 标准状态下拉框 --单选
|
||||
|
||||
@TableField(exist = false)
|
||||
private String standNatrueShow;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String standSortShow;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String applyCountryShow;
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<AttFileVo> standFileList = new ArrayList<AttFileVo>();
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<AttFileVo> opinionFilesList = new ArrayList<AttFileVo>();
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<AttFileVo> relevanceFileList = new ArrayList<AttFileVo>();
|
||||
|
||||
@TableField(exist = false)
|
||||
private String collectId;
|
||||
|
||||
//文件的类型
|
||||
@TableField(exist = false)
|
||||
private String standFileClassify;
|
||||
|
||||
//文件的下载id
|
||||
@TableField(exist = false)
|
||||
private String attId;
|
||||
|
||||
//记录是否修改了替代文件号
|
||||
@TableField(exist = false)
|
||||
private int upReplaceNumFlag;
|
||||
//记录是否修改了文件号
|
||||
@TableField(exist = false)
|
||||
private int upNumFlag;
|
||||
// 数据库新加的字段
|
||||
|
||||
@TableField(exist = false)
|
||||
private String remark;//备注
|
||||
|
||||
@TableField(exist = false)
|
||||
private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
|
||||
|
||||
@TableField(exist = false)
|
||||
private String sarStandAttrEOStr; //新增修改时属性表信息
|
||||
|
||||
@TableField(exist = false)
|
||||
private String fileIds; //全部文件ID
|
||||
|
||||
@TableField(exist = false)
|
||||
private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
|
||||
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.sarBussionessStand.service;
|
||||
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 企业标准信息表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-13
|
||||
*/
|
||||
public interface ISarBussionessStandService extends IService<SarBussionessStand> {
|
||||
|
||||
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.adc.da.slrs.sarBussionessStand.service.impl;
|
||||
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
|
||||
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 企业标准信息表 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-13
|
||||
*/
|
||||
@Service
|
||||
public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStandDao, SarBussionessStand> implements ISarBussionessStandService {
|
||||
|
||||
@Override
|
||||
public List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){
|
||||
return this.baseMapper.queryByList(sarBussionessStandEOPage);
|
||||
}
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package com.adc.da.slrs.sarModelTree.controller;
|
||||
|
||||
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.adc.da.base.web.BaseController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
@RestController
|
||||
@Api(tags = "福田标准法规--标准法规库-模块树结构")
|
||||
@RequestMapping("/${restPath}/sarModelTree")
|
||||
public class SarModelTreeController extends BaseController<SarModelTree> {
|
||||
|
||||
@Autowired
|
||||
private ISarModelTreeService iSarModelTreeService;
|
||||
|
||||
@ApiOperation("查询所有资源")
|
||||
@GetMapping("/list")
|
||||
public ResponseMessage<List<SarModelTree>> getAll(SarModelTree sarVppsTree){
|
||||
List<SarModelTree> tsResources = iSarModelTreeService.getAll(sarVppsTree);
|
||||
return Result.success(tsResources);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.sarModelTree.dao;
|
||||
|
||||
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
public interface SarModelTreeDao extends BaseMapper<SarModelTree> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package com.adc.da.slrs.sarModelTree.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarModelTree对象", description="")
|
||||
public class SarModelTree extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@TableField("NAME")
|
||||
private String name;
|
||||
|
||||
@TableField("PID")
|
||||
private String pid;
|
||||
|
||||
@TableField("MODEL")
|
||||
private String model;
|
||||
|
||||
@ApiModelProperty(value = "模块结构特性")
|
||||
@TableField("FEATURES")
|
||||
private String features;
|
||||
|
||||
@ApiModelProperty(value = "删除标识 1：未删除 2：已删除")
|
||||
@TableField("DEL_FLAG")
|
||||
private String delFlag;
|
||||
|
||||
@ApiModelProperty(value = "排序序号")
|
||||
@TableField("SORT")
|
||||
private Integer sort;
|
||||
|
||||
@ApiModelProperty(value = "子菜单")
|
||||
@TableField(exist = false)
|
||||
private List<SarModelTree> children;
|
||||
|
||||
@ApiModelProperty(value = "上级菜单名称")
|
||||
@TableField(exist = false)
|
||||
private String parentIdsName;
|
||||
|
||||
@TableField(exist=false)
|
||||
private List<String> roleIds;
|
||||
|
||||
@TableField(exist=false)
|
||||
private List<String> childMenuIds;
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.adc.da.slrs.sarModelTree.service;
|
||||
|
||||
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
public interface ISarModelTreeService extends IService<SarModelTree> {
|
||||
|
||||
List<SarModelTree> getAll(SarModelTree sarModelTree);
|
||||
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.adc.da.slrs.sarModelTree.service.impl;
|
||||
|
||||
import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
|
||||
import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao;
|
||||
import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
@Service
|
||||
public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarModelTree> implements ISarModelTreeService {
|
||||
|
||||
/**
|
||||
* 查询所有菜单
|
||||
* @param sarModelTree
|
||||
*/
|
||||
@Override
|
||||
public List<SarModelTree> getAll(SarModelTree sarModelTree) {
|
||||
QueryWrapper<SarModelTree> tsResourceQueryWrapper=new QueryWrapper<>();
|
||||
tsResourceQueryWrapper.isNull("PID");
|
||||
List<SarModelTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
|
||||
for(SarModelTree tree:list){
|
||||
tree.setChildren(recursionGetChildren((tree)));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归调用获取子节点
|
||||
* @param parent：父节点
|
||||
* @return List<SarMenu>
|
||||
*/
|
||||
private List<SarModelTree> recursionGetChildren(SarModelTree parent){
|
||||
QueryWrapper<SarModelTree> sarMenuQueryWrapper=new QueryWrapper<>();
|
||||
sarMenuQueryWrapper.orderByAsc("SORT");
|
||||
sarMenuQueryWrapper.eq("PID",parent.getId());
|
||||
List<SarModelTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
|
||||
for(SarModelTree sarMenu:children){
|
||||
sarMenu.setChildren(recursionGetChildren((sarMenu)));
|
||||
}
|
||||
return children;
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -187,8 +187,8 @@ public class SarStandAttrInfo extends BaseEntity {
|
||||
private String sycpx;
|
||||
|
||||
@ApiModelProperty(value = "适用认证")
|
||||
@TableField("SYZD")
|
||||
private String syzd;
|
||||
@TableField("SYRZ")
|
||||
private String syrz;
|
||||
|
||||
@ApiModelProperty(value = "责任工程师")
|
||||
@TableField("ZRGCS")
|
||||
|
||||
+102
-3
@@ -1,6 +1,7 @@
|
||||
package com.adc.da.slrs.sarStandardComplianceAssessResult.controller;
|
||||
|
||||
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import com.adc.da.base.web.BaseController;
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
@@ -16,12 +17,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import oracle.ucp.proxy.annotation.Post;
|
||||
import org.apache.commons.beanutils.BeanUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -98,6 +104,55 @@ public class SarStandardComplianceAssessResultController {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class InsertEntity<T>{
|
||||
List<Map> entityList;
|
||||
T eo;
|
||||
}
|
||||
|
||||
@ApiOperation(value="（插入/更新）标准清单")
|
||||
@PostMapping("/standard")
|
||||
public ResponseMessage insertStandard(@RequestBody InsertEntity<SarStandardsInfoEO> insertEntity) throws InvocationTargetException, IllegalAccessException {
|
||||
|
||||
SarStandardsInfoEO eo = insertEntity.eo;
|
||||
|
||||
if (eo.getStandApplicationType() == 1) {
|
||||
|
||||
List<SarStandardComplianceProductAssess> entityList = new ArrayList<>();
|
||||
for (int i = 0; i < insertEntity.entityList.size(); i++) {
|
||||
SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess();
|
||||
BeanUtils.populate(obj, insertEntity.entityList.get(i));
|
||||
entityList.add(obj);
|
||||
}
|
||||
|
||||
iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList);
|
||||
|
||||
}else {
|
||||
if(eo.getPosition()==1){
|
||||
List<SarInterpretationNationalStandard> entityList = new ArrayList<>();
|
||||
for (int i = 0; i < insertEntity.entityList.size(); i++) {
|
||||
SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard();
|
||||
BeanUtils.populate(obj, insertEntity.entityList.get(i));
|
||||
entityList.add(obj);
|
||||
}
|
||||
iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList);
|
||||
|
||||
}else{
|
||||
List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
|
||||
for (int i = 0; i < insertEntity.entityList.size(); i++) {
|
||||
SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard();
|
||||
BeanUtils.populate(obj, insertEntity.entityList.get(i));
|
||||
entityList.add(obj);
|
||||
}
|
||||
iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "条件查询标准涉及项目符合性清单")
|
||||
@GetMapping("/product")
|
||||
public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
|
||||
@@ -114,6 +169,17 @@ public class SarStandardComplianceAssessResultController {
|
||||
return Result.success(page);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "插入标准涉及项目符合性清单")
|
||||
@PostMapping("/product")
|
||||
public ResponseMessage insertProduct(List<SarStandardComplianceProductAssess> eo) throws Exception {
|
||||
|
||||
iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo);
|
||||
|
||||
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "条件查询技术审核符合性清单")
|
||||
@GetMapping("/interpretation")
|
||||
public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
|
||||
@@ -137,4 +203,37 @@ public class SarStandardComplianceAssessResultController {
|
||||
return Result.success(page);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "插入技术审核符合性清单")
|
||||
@PostMapping("/interpretation")
|
||||
public ResponseMessage insertInterpretation(InsertEntity<InterpretationEO> insertEntity) throws Exception {
|
||||
|
||||
InterpretationEO eo = insertEntity.eo;
|
||||
|
||||
if (eo.getPosition()==1) {
|
||||
|
||||
List<SarInterpretationNationalStandard> entityList = new ArrayList<>();
|
||||
for (int i = 0; i < insertEntity.entityList.size(); i++) {
|
||||
SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard();
|
||||
BeanUtils.populate(obj, insertEntity.entityList.get(i));
|
||||
entityList.add(obj);
|
||||
}
|
||||
iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList);
|
||||
} else {
|
||||
|
||||
|
||||
|
||||
List<SarInterpretationForeignStandard> entityList = new ArrayList<>();
|
||||
for (int i = 0; i < insertEntity.entityList.size(); i++) {
|
||||
SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard();
|
||||
BeanUtils.populate(obj, insertEntity.entityList.get(i));
|
||||
entityList.add(obj);
|
||||
}
|
||||
iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList);
|
||||
|
||||
}
|
||||
|
||||
return Result.success();
|
||||
}
|
||||
}
|
||||
|
||||
+42
@@ -11,6 +11,8 @@ import com.adc.da.exception.AdcDaBaseException;
|
||||
import com.adc.da.http.PageInfo;
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
|
||||
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.*;
|
||||
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
|
||||
@@ -63,6 +65,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
||||
@Autowired
|
||||
private ISarStandardsInfoService sarStandardsInfoEOService;
|
||||
|
||||
@Autowired
|
||||
private ISarBussionessStandService iSarBussionessStandService;
|
||||
|
||||
|
||||
@Value("${file.path}")
|
||||
private String filePath;
|
||||
@@ -414,6 +419,15 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "标准发布查询")
|
||||
@GetMapping("/getStandInfoByList")
|
||||
//@RequiresPermissions("lawss:sarStandardsInfo:get")
|
||||
public ResponseMessage<List<SarStandardsInfo>> getStandInfoByList(String limit) throws Exception {
|
||||
List<SarStandardsInfo> result = sarStandardsInfoEOService.getStandInfoByList(limit);
|
||||
return Result.success(result);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarStandardsInfoEO|详情")
|
||||
@GetMapping("/getStandInfoById")
|
||||
//@RequiresPermissions("lawss:sarStandardsInfo:get")
|
||||
@@ -556,5 +570,33 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
|
||||
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarStandardsInfoEO|根据标准号查询")
|
||||
@GetMapping("/queryInfoByStandNum")
|
||||
//@RequiresPermissions("lawss:sarStandardsInfo:list")
|
||||
public ResponseMessage queryInfoByStandNum(SarStandardsInfoEOPage page) throws Exception {
|
||||
if (org.apache.commons.lang.StringUtils.isNotBlank(page.getStandNumber())){
|
||||
String sort = "";
|
||||
if (page.getStandNumber().length()>3) {
|
||||
sort = page.getStandNumber().substring(0, 3);
|
||||
}
|
||||
if ("ECE".equals(sort)) {
|
||||
int length = page.getStandNumber().length();
|
||||
String number = page.getStandNumber().substring(3,length);
|
||||
page.setStandNumber("UN(ECE)" + number);
|
||||
}
|
||||
}
|
||||
List<SarStandardsInfo> getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType());
|
||||
SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage();
|
||||
sarBussionessStandEOPage.setStandCode(page.getStandNumber());
|
||||
List<SarBussionessStand> list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage);
|
||||
if(getList.size()>0){
|
||||
return Result.success(getList.get(0));
|
||||
}
|
||||
if (list.size()>0){
|
||||
return Result.success(list.get(0));
|
||||
}
|
||||
return Result.success("0","标准/企标已不存在");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2
@@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
|
||||
|
||||
List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
|
||||
|
||||
List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit);
|
||||
|
||||
Integer selectStandColumn(@Param("columnName") String columnName);
|
||||
|
||||
Integer selectCounterStandardsCount(SarStandardsInfo sarStandardsInfoEO);
|
||||
|
||||
+896
@@ -0,0 +1,896 @@
|
||||
package com.adc.da.slrs.sarStandardsInfo.entity;
|
||||
|
||||
import com.adc.da.sys.common.BasePage;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <b>功能：</b>SAR_BUSSIONESS_STAND SarBussionessStandEOPage<br>
|
||||
* <b>作者：</b>code generator<br>
|
||||
* <b>日期：</b> 2018-09-03 <br>
|
||||
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
|
||||
*/
|
||||
public class SarBussionessStandEOPage extends BasePage {
|
||||
|
||||
private String modifyTime;
|
||||
private String modifyTime1;
|
||||
private String modifyTime2;
|
||||
private String modifyTimeOperator = "=";
|
||||
private String creationTime;
|
||||
private String creationTime1;
|
||||
private String creationTime2;
|
||||
private String creationTimeOperator = "=";
|
||||
private String validFlag;
|
||||
private String validFlagOperator = "=";
|
||||
private String putUser;
|
||||
private String putUserOperator = "=";
|
||||
private String citationUser;
|
||||
private String citationUserOperator = "=";
|
||||
private String responsibleUnit;
|
||||
private String responsibleUnitOperator = "=";
|
||||
private String standFile;
|
||||
private String standFileOperator = "=";
|
||||
private String tags;
|
||||
private String tagsOperator = "=";
|
||||
private String standStatus;
|
||||
private String standStatusOperator = "=";
|
||||
private String replacedStandNum;
|
||||
private String replacedStandNumOperator = "=";
|
||||
private String replaceStandNum;
|
||||
private String replaceStandNumOperator = "=";
|
||||
private String quoteStand;
|
||||
private String quoteStandOperator = "=";
|
||||
private String firstPutTime;
|
||||
private String firstPutTime1;
|
||||
private String firstPutTime2;
|
||||
private String firstPutTimeOperator = "=";
|
||||
private String putYear;
|
||||
private String putYear1;
|
||||
private String putYear2;
|
||||
private String putYearOperator = "=";
|
||||
private String putTime;
|
||||
private String putTime1;
|
||||
private String putTime2;
|
||||
private String putTimeOperator = "=";
|
||||
private String issueTime;
|
||||
private String issueTime1;
|
||||
private String issueTime2;
|
||||
private String issueTimeOperator = "=";
|
||||
private String energyKind;
|
||||
private String energyKindOperator = "=";
|
||||
private String applyArctic;
|
||||
private String applyArcticOperator = "=";
|
||||
private String standEnName;
|
||||
private String standEnNameOperator = "=";
|
||||
private String standName;
|
||||
private String standNameOperator = "=";
|
||||
private String standCode;
|
||||
private String standCodeOperator = "=";
|
||||
private String classifyCode;
|
||||
private String classifyCodeOperator = "=";
|
||||
private String standSubclass;
|
||||
private String standSubclassOperator = "=";
|
||||
private String standGenera;
|
||||
private String standGeneraOperator = "=";
|
||||
private String id;
|
||||
private String idOperator = "=";
|
||||
// 数据库新增字段
|
||||
private String applyCountry;
|
||||
private String standYear;
|
||||
private String applyCountryOperator = "=";
|
||||
private String standNature;
|
||||
private String standNatureOperator = "=";
|
||||
private String synopsis;
|
||||
private String synopsisOperator = "=";
|
||||
private String standSort;
|
||||
private String standSortOperator = "=";
|
||||
private String opinionFile;
|
||||
private String opinionFileOperator = "=";
|
||||
private String relevanceFile;
|
||||
private String relevanceFileOperator = "=";
|
||||
private String remark;
|
||||
private String remarkOperator = "=";
|
||||
|
||||
private List<String> roleIds;
|
||||
private String rootMenuId;
|
||||
private String orgName;
|
||||
private List<String> menuRoleList;
|
||||
private String[] replacedStandNumList;
|
||||
private String numberName;
|
||||
// 树结构增加搜索条件
|
||||
private String collectMenuId;
|
||||
private String advanceSearchVOStr;
|
||||
private String advanceSearchStr;
|
||||
private List<String> menuAllChildrenIdList;
|
||||
private String userId;
|
||||
|
||||
private String zqcrId;
|
||||
|
||||
//页面排序
|
||||
private String paixu;
|
||||
private String shunxu;
|
||||
private String sql;
|
||||
|
||||
public String getZqcrId() {
|
||||
return zqcrId;
|
||||
}
|
||||
|
||||
public void setZqcrId(String zqcrId) {
|
||||
this.zqcrId = zqcrId;
|
||||
}
|
||||
|
||||
public String getModifyTime() {
|
||||
return this.modifyTime;
|
||||
}
|
||||
|
||||
public void setModifyTime(String modifyTime) {
|
||||
this.modifyTime = modifyTime;
|
||||
}
|
||||
|
||||
public String getModifyTime1() {
|
||||
return this.modifyTime1;
|
||||
}
|
||||
|
||||
public void setModifyTime1(String modifyTime1) {
|
||||
this.modifyTime1 = modifyTime1;
|
||||
}
|
||||
|
||||
public String getModifyTime2() {
|
||||
return this.modifyTime2;
|
||||
}
|
||||
|
||||
public void setModifyTime2(String modifyTime2) {
|
||||
this.modifyTime2 = modifyTime2;
|
||||
}
|
||||
|
||||
public String getModifyTimeOperator() {
|
||||
return this.modifyTimeOperator;
|
||||
}
|
||||
|
||||
public void setModifyTimeOperator(String modifyTimeOperator) {
|
||||
this.modifyTimeOperator = modifyTimeOperator;
|
||||
}
|
||||
|
||||
public String getCreationTime() {
|
||||
return this.creationTime;
|
||||
}
|
||||
|
||||
public void setCreationTime(String creationTime) {
|
||||
this.creationTime = creationTime;
|
||||
}
|
||||
|
||||
public String getCreationTime1() {
|
||||
return this.creationTime1;
|
||||
}
|
||||
|
||||
public void setCreationTime1(String creationTime1) {
|
||||
this.creationTime1 = creationTime1;
|
||||
}
|
||||
|
||||
public String getCreationTime2() {
|
||||
return this.creationTime2;
|
||||
}
|
||||
|
||||
public void setCreationTime2(String creationTime2) {
|
||||
this.creationTime2 = creationTime2;
|
||||
}
|
||||
|
||||
public String getCreationTimeOperator() {
|
||||
return this.creationTimeOperator;
|
||||
}
|
||||
|
||||
public void setCreationTimeOperator(String creationTimeOperator) {
|
||||
this.creationTimeOperator = creationTimeOperator;
|
||||
}
|
||||
|
||||
public String getValidFlag() {
|
||||
return this.validFlag;
|
||||
}
|
||||
|
||||
public void setValidFlag(String validFlag) {
|
||||
this.validFlag = validFlag;
|
||||
}
|
||||
|
||||
public String getValidFlagOperator() {
|
||||
return this.validFlagOperator;
|
||||
}
|
||||
|
||||
public void setValidFlagOperator(String validFlagOperator) {
|
||||
this.validFlagOperator = validFlagOperator;
|
||||
}
|
||||
|
||||
public String getPutUser() {
|
||||
return this.putUser;
|
||||
}
|
||||
|
||||
public void setPutUser(String putUser) {
|
||||
this.putUser = putUser;
|
||||
}
|
||||
|
||||
public String getPutUserOperator() {
|
||||
return this.putUserOperator;
|
||||
}
|
||||
|
||||
public void setPutUserOperator(String putUserOperator) {
|
||||
this.putUserOperator = putUserOperator;
|
||||
}
|
||||
|
||||
public String getCitationUser() {
|
||||
return this.citationUser;
|
||||
}
|
||||
|
||||
public void setCitationUser(String citationUser) {
|
||||
this.citationUser = citationUser;
|
||||
}
|
||||
|
||||
public String getCitationUserOperator() {
|
||||
return this.citationUserOperator;
|
||||
}
|
||||
|
||||
public void setCitationUserOperator(String citationUserOperator) {
|
||||
this.citationUserOperator = citationUserOperator;
|
||||
}
|
||||
|
||||
public String getResponsibleUnit() {
|
||||
return this.responsibleUnit;
|
||||
}
|
||||
|
||||
public void setResponsibleUnit(String responsibleUnit) {
|
||||
this.responsibleUnit = responsibleUnit;
|
||||
}
|
||||
|
||||
public String getResponsibleUnitOperator() {
|
||||
return this.responsibleUnitOperator;
|
||||
}
|
||||
|
||||
public void setResponsibleUnitOperator(String responsibleUnitOperator) {
|
||||
this.responsibleUnitOperator = responsibleUnitOperator;
|
||||
}
|
||||
|
||||
public String getStandFile() {
|
||||
return this.standFile;
|
||||
}
|
||||
|
||||
public void setStandFile(String standFile) {
|
||||
this.standFile = standFile;
|
||||
}
|
||||
|
||||
public String getStandFileOperator() {
|
||||
return this.standFileOperator;
|
||||
}
|
||||
|
||||
public void setStandFileOperator(String standFileOperator) {
|
||||
this.standFileOperator = standFileOperator;
|
||||
}
|
||||
|
||||
public String getTags() {
|
||||
return this.tags;
|
||||
}
|
||||
|
||||
public void setTags(String tags) {
|
||||
this.tags = tags;
|
||||
}
|
||||
|
||||
public String getTagsOperator() {
|
||||
return this.tagsOperator;
|
||||
}
|
||||
|
||||
public void setTagsOperator(String tagsOperator) {
|
||||
this.tagsOperator = tagsOperator;
|
||||
}
|
||||
|
||||
public String getStandStatus() {
|
||||
return this.standStatus;
|
||||
}
|
||||
|
||||
public void setStandStatus(String standStatus) {
|
||||
this.standStatus = standStatus;
|
||||
}
|
||||
|
||||
public String getStandStatusOperator() {
|
||||
return this.standStatusOperator;
|
||||
}
|
||||
|
||||
public void setStandStatusOperator(String standStatusOperator) {
|
||||
this.standStatusOperator = standStatusOperator;
|
||||
}
|
||||
|
||||
public String getReplacedStandNum() {
|
||||
return this.replacedStandNum;
|
||||
}
|
||||
|
||||
public void setReplacedStandNum(String replacedStandNum) {
|
||||
this.replacedStandNum = replacedStandNum;
|
||||
}
|
||||
|
||||
public String getReplacedStandNumOperator() {
|
||||
return this.replacedStandNumOperator;
|
||||
}
|
||||
|
||||
public void setReplacedStandNumOperator(String replacedStandNumOperator) {
|
||||
this.replacedStandNumOperator = replacedStandNumOperator;
|
||||
}
|
||||
|
||||
public String getReplaceStandNum() {
|
||||
return this.replaceStandNum;
|
||||
}
|
||||
|
||||
public void setReplaceStandNum(String replaceStandNum) {
|
||||
this.replaceStandNum = replaceStandNum;
|
||||
}
|
||||
|
||||
public String getReplaceStandNumOperator() {
|
||||
return this.replaceStandNumOperator;
|
||||
}
|
||||
|
||||
public void setReplaceStandNumOperator(String replaceStandNumOperator) {
|
||||
this.replaceStandNumOperator = replaceStandNumOperator;
|
||||
}
|
||||
|
||||
public String getQuoteStand() {
|
||||
return this.quoteStand;
|
||||
}
|
||||
|
||||
public void setQuoteStand(String quoteStand) {
|
||||
this.quoteStand = quoteStand;
|
||||
}
|
||||
|
||||
public String getQuoteStandOperator() {
|
||||
return this.quoteStandOperator;
|
||||
}
|
||||
|
||||
public void setQuoteStandOperator(String quoteStandOperator) {
|
||||
this.quoteStandOperator = quoteStandOperator;
|
||||
}
|
||||
|
||||
public String getFirstPutTime() {
|
||||
return this.firstPutTime;
|
||||
}
|
||||
|
||||
public void setFirstPutTime(String firstPutTime) {
|
||||
this.firstPutTime = firstPutTime;
|
||||
}
|
||||
|
||||
public String getFirstPutTime1() {
|
||||
return this.firstPutTime1;
|
||||
}
|
||||
|
||||
public void setFirstPutTime1(String firstPutTime1) {
|
||||
this.firstPutTime1 = firstPutTime1;
|
||||
}
|
||||
|
||||
public String getFirstPutTime2() {
|
||||
return this.firstPutTime2;
|
||||
}
|
||||
|
||||
public void setFirstPutTime2(String firstPutTime2) {
|
||||
this.firstPutTime2 = firstPutTime2;
|
||||
}
|
||||
|
||||
public String getFirstPutTimeOperator() {
|
||||
return this.firstPutTimeOperator;
|
||||
}
|
||||
|
||||
public void setFirstPutTimeOperator(String firstPutTimeOperator) {
|
||||
this.firstPutTimeOperator = firstPutTimeOperator;
|
||||
}
|
||||
|
||||
public String getPutYear() {
|
||||
return this.putYear;
|
||||
}
|
||||
|
||||
public void setPutYear(String putYear) {
|
||||
this.putYear = putYear;
|
||||
}
|
||||
|
||||
public String getPutYear1() {
|
||||
return this.putYear1;
|
||||
}
|
||||
|
||||
public void setPutYear1(String putYear1) {
|
||||
this.putYear1 = putYear1;
|
||||
}
|
||||
|
||||
public String getPutYear2() {
|
||||
return this.putYear2;
|
||||
}
|
||||
|
||||
public void setPutYear2(String putYear2) {
|
||||
this.putYear2 = putYear2;
|
||||
}
|
||||
|
||||
public String getPutYearOperator() {
|
||||
return this.putYearOperator;
|
||||
}
|
||||
|
||||
public void setPutYearOperator(String putYearOperator) {
|
||||
this.putYearOperator = putYearOperator;
|
||||
}
|
||||
|
||||
public String getPutTime() {
|
||||
return this.putTime;
|
||||
}
|
||||
|
||||
public void setPutTime(String putTime) {
|
||||
this.putTime = putTime;
|
||||
}
|
||||
|
||||
public String getPutTime1() {
|
||||
return this.putTime1;
|
||||
}
|
||||
|
||||
public void setPutTime1(String putTime1) {
|
||||
this.putTime1 = putTime1;
|
||||
}
|
||||
|
||||
public String getPutTime2() {
|
||||
return this.putTime2;
|
||||
}
|
||||
|
||||
public void setPutTime2(String putTime2) {
|
||||
this.putTime2 = putTime2;
|
||||
}
|
||||
|
||||
public String getPutTimeOperator() {
|
||||
return this.putTimeOperator;
|
||||
}
|
||||
|
||||
public void setPutTimeOperator(String putTimeOperator) {
|
||||
this.putTimeOperator = putTimeOperator;
|
||||
}
|
||||
|
||||
public String getIssueTime() {
|
||||
return this.issueTime;
|
||||
}
|
||||
|
||||
public void setIssueTime(String issueTime) {
|
||||
this.issueTime = issueTime;
|
||||
}
|
||||
|
||||
public String getIssueTime1() {
|
||||
return this.issueTime1;
|
||||
}
|
||||
|
||||
public void setIssueTime1(String issueTime1) {
|
||||
this.issueTime1 = issueTime1;
|
||||
}
|
||||
|
||||
public String getIssueTime2() {
|
||||
return this.issueTime2;
|
||||
}
|
||||
|
||||
public void setIssueTime2(String issueTime2) {
|
||||
this.issueTime2 = issueTime2;
|
||||
}
|
||||
|
||||
public String getIssueTimeOperator() {
|
||||
return this.issueTimeOperator;
|
||||
}
|
||||
|
||||
public void setIssueTimeOperator(String issueTimeOperator) {
|
||||
this.issueTimeOperator = issueTimeOperator;
|
||||
}
|
||||
|
||||
public String getEnergyKind() {
|
||||
return this.energyKind;
|
||||
}
|
||||
|
||||
public void setEnergyKind(String energyKind) {
|
||||
this.energyKind = energyKind;
|
||||
}
|
||||
|
||||
public String getEnergyKindOperator() {
|
||||
return this.energyKindOperator;
|
||||
}
|
||||
|
||||
public void setEnergyKindOperator(String energyKindOperator) {
|
||||
this.energyKindOperator = energyKindOperator;
|
||||
}
|
||||
|
||||
public String getApplyArctic() {
|
||||
return this.applyArctic;
|
||||
}
|
||||
|
||||
public void setApplyArctic(String applyArctic) {
|
||||
this.applyArctic = applyArctic;
|
||||
}
|
||||
|
||||
public String getApplyArcticOperator() {
|
||||
return this.applyArcticOperator;
|
||||
}
|
||||
|
||||
public void setApplyArcticOperator(String applyArcticOperator) {
|
||||
this.applyArcticOperator = applyArcticOperator;
|
||||
}
|
||||
|
||||
public String getStandEnName() {
|
||||
return this.standEnName;
|
||||
}
|
||||
|
||||
public void setStandEnName(String standEnName) {
|
||||
this.standEnName = standEnName;
|
||||
}
|
||||
|
||||
public String getStandEnNameOperator() {
|
||||
return this.standEnNameOperator;
|
||||
}
|
||||
|
||||
public void setStandEnNameOperator(String standEnNameOperator) {
|
||||
this.standEnNameOperator = standEnNameOperator;
|
||||
}
|
||||
|
||||
public String getStandName() {
|
||||
return this.standName;
|
||||
}
|
||||
|
||||
public void setStandName(String standName) {
|
||||
this.standName = standName;
|
||||
}
|
||||
|
||||
public String getStandNameOperator() {
|
||||
return this.standNameOperator;
|
||||
}
|
||||
|
||||
public void setStandNameOperator(String standNameOperator) {
|
||||
this.standNameOperator = standNameOperator;
|
||||
}
|
||||
|
||||
public String getStandCode() {
|
||||
return this.standCode;
|
||||
}
|
||||
|
||||
public void setStandCode(String standCode) {
|
||||
this.standCode = standCode;
|
||||
}
|
||||
|
||||
public String getStandCodeOperator() {
|
||||
return this.standCodeOperator;
|
||||
}
|
||||
|
||||
public void setStandCodeOperator(String standCodeOperator) {
|
||||
this.standCodeOperator = standCodeOperator;
|
||||
}
|
||||
|
||||
public String getClassifyCode() {
|
||||
return this.classifyCode;
|
||||
}
|
||||
|
||||
public void setClassifyCode(String classifyCode) {
|
||||
this.classifyCode = classifyCode;
|
||||
}
|
||||
|
||||
public String getClassifyCodeOperator() {
|
||||
return this.classifyCodeOperator;
|
||||
}
|
||||
|
||||
public void setClassifyCodeOperator(String classifyCodeOperator) {
|
||||
this.classifyCodeOperator = classifyCodeOperator;
|
||||
}
|
||||
|
||||
public String getStandSubclass() {
|
||||
return this.standSubclass;
|
||||
}
|
||||
|
||||
public void setStandSubclass(String standSubclass) {
|
||||
this.standSubclass = standSubclass;
|
||||
}
|
||||
|
||||
public String getStandSubclassOperator() {
|
||||
return this.standSubclassOperator;
|
||||
}
|
||||
|
||||
public void setStandSubclassOperator(String standSubclassOperator) {
|
||||
this.standSubclassOperator = standSubclassOperator;
|
||||
}
|
||||
|
||||
public String getStandGenera() {
|
||||
return this.standGenera;
|
||||
}
|
||||
|
||||
public void setStandGenera(String standGenera) {
|
||||
this.standGenera = standGenera;
|
||||
}
|
||||
|
||||
public String getStandGeneraOperator() {
|
||||
return this.standGeneraOperator;
|
||||
}
|
||||
|
||||
public void setStandGeneraOperator(String standGeneraOperator) {
|
||||
this.standGeneraOperator = standGeneraOperator;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getIdOperator() {
|
||||
return this.idOperator;
|
||||
}
|
||||
|
||||
public void setIdOperator(String idOperator) {
|
||||
this.idOperator = idOperator;
|
||||
}
|
||||
|
||||
private String menuId;
|
||||
private String[] idlist; //用于导出数据过程中传递选择的标准id
|
||||
private String[] replaceStandNumList;
|
||||
|
||||
public String getMenuId() {
|
||||
return menuId;
|
||||
}
|
||||
|
||||
public void setMenuId(String menuId) {
|
||||
this.menuId = menuId;
|
||||
}
|
||||
|
||||
public String[] getIdlist() {
|
||||
return idlist;
|
||||
}
|
||||
|
||||
public void setIdlist(String[] idlist) {
|
||||
this.idlist = idlist;
|
||||
}
|
||||
|
||||
public String[] getReplaceStandNumList() {
|
||||
return replaceStandNumList;
|
||||
}
|
||||
|
||||
public void setReplaceStandNumList(String[] replaceStandNumList) {
|
||||
this.replaceStandNumList = replaceStandNumList;
|
||||
}
|
||||
|
||||
private String[] applyArcticList;
|
||||
private String[] energyKindList;
|
||||
|
||||
public String[] getApplyArcticList() {
|
||||
return applyArcticList;
|
||||
}
|
||||
|
||||
public void setApplyArcticList(String[] applyArcticList) {
|
||||
this.applyArcticList = applyArcticList;
|
||||
}
|
||||
|
||||
public String[] getEnergyKindList() {
|
||||
return energyKindList;
|
||||
}
|
||||
|
||||
public void setEnergyKindList(String[] energyKindList) {
|
||||
this.energyKindList = energyKindList;
|
||||
}
|
||||
|
||||
public String getApplyCountry() {
|
||||
return applyCountry;
|
||||
}
|
||||
|
||||
public void setApplyCountry(String applyCountry) {
|
||||
this.applyCountry = applyCountry;
|
||||
}
|
||||
|
||||
public String getApplyCountryOperator() {
|
||||
return applyCountryOperator;
|
||||
}
|
||||
|
||||
public void setApplyCountryOperator(String applyCountryOperator) {
|
||||
this.applyCountryOperator = applyCountryOperator;
|
||||
}
|
||||
|
||||
public String getStandNature() {
|
||||
return standNature;
|
||||
}
|
||||
|
||||
public void setStandNature(String standNature) {
|
||||
this.standNature = standNature;
|
||||
}
|
||||
|
||||
public String getStandNatureOperator() {
|
||||
return standNatureOperator;
|
||||
}
|
||||
|
||||
public void setStandNatureOperator(String standNatureOperator) {
|
||||
this.standNatureOperator = standNatureOperator;
|
||||
}
|
||||
|
||||
public String getSynopsis() {
|
||||
return synopsis;
|
||||
}
|
||||
|
||||
public void setSynopsis(String synopsis) {
|
||||
this.synopsis = synopsis;
|
||||
}
|
||||
|
||||
public String getSynopsisOperator() {
|
||||
return synopsisOperator;
|
||||
}
|
||||
|
||||
public void setSynopsisOperator(String synopsisOperator) {
|
||||
this.synopsisOperator = synopsisOperator;
|
||||
}
|
||||
|
||||
public String getStandSort() {
|
||||
return standSort;
|
||||
}
|
||||
|
||||
public void setStandSort(String standSort) {
|
||||
this.standSort = standSort;
|
||||
}
|
||||
|
||||
public String getStandSortOperator() {
|
||||
return standSortOperator;
|
||||
}
|
||||
|
||||
public void setStandSortOperator(String standSortOperator) {
|
||||
this.standSortOperator = standSortOperator;
|
||||
}
|
||||
|
||||
public String getOpinionFile() {
|
||||
return opinionFile;
|
||||
}
|
||||
|
||||
public void setOpinionFile(String opinionFile) {
|
||||
this.opinionFile = opinionFile;
|
||||
}
|
||||
|
||||
public String getOpinionFileOperator() {
|
||||
return opinionFileOperator;
|
||||
}
|
||||
|
||||
public void setOpinionFileOperator(String opinionFileOperator) {
|
||||
this.opinionFileOperator = opinionFileOperator;
|
||||
}
|
||||
|
||||
public String getRelevanceFile() {
|
||||
return relevanceFile;
|
||||
}
|
||||
|
||||
public void setRelevanceFile(String relevanceFile) {
|
||||
this.relevanceFile = relevanceFile;
|
||||
}
|
||||
|
||||
public String getRelevanceFileOperator() {
|
||||
return relevanceFileOperator;
|
||||
}
|
||||
|
||||
public void setRelevanceFileOperator(String relevanceFileOperator) {
|
||||
this.relevanceFileOperator = relevanceFileOperator;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public String getRemarkOperator() {
|
||||
return remarkOperator;
|
||||
}
|
||||
|
||||
public void setRemarkOperator(String remarkOperator) {
|
||||
this.remarkOperator = remarkOperator;
|
||||
}
|
||||
|
||||
public List<String> getRoleIds() {
|
||||
return roleIds;
|
||||
}
|
||||
|
||||
public void setRoleIds(List<String> roleIds) {
|
||||
this.roleIds = roleIds;
|
||||
}
|
||||
|
||||
public String getStandYear() {
|
||||
return standYear;
|
||||
}
|
||||
|
||||
public void setStandYear(String standYear) {
|
||||
this.standYear = standYear;
|
||||
}
|
||||
|
||||
public List<String> getMenuRoleList() {
|
||||
return menuRoleList;
|
||||
}
|
||||
|
||||
public void setMenuRoleList(List<String> menuRoleList) {
|
||||
this.menuRoleList = menuRoleList;
|
||||
}
|
||||
|
||||
public String getNumberName() {
|
||||
return numberName;
|
||||
}
|
||||
|
||||
public void setNumberName(String numberName) {
|
||||
this.numberName = numberName;
|
||||
}
|
||||
|
||||
public String[] getReplacedStandNumList() {
|
||||
return replacedStandNumList;
|
||||
}
|
||||
|
||||
public void setReplacedStandNumList(String[] replacedStandNumList) {
|
||||
this.replacedStandNumList = replacedStandNumList;
|
||||
}
|
||||
|
||||
public String getRootMenuId() {
|
||||
return rootMenuId;
|
||||
}
|
||||
|
||||
public void setRootMenuId(String rootMenuId) {
|
||||
this.rootMenuId = rootMenuId;
|
||||
}
|
||||
|
||||
public String getCollectMenuId() {
|
||||
return collectMenuId;
|
||||
}
|
||||
|
||||
public void setCollectMenuId(String collectMenuId) {
|
||||
this.collectMenuId = collectMenuId;
|
||||
}
|
||||
|
||||
public String getAdvanceSearchVOStr() {
|
||||
return advanceSearchVOStr;
|
||||
}
|
||||
|
||||
public void setAdvanceSearchVOStr(String advanceSearchVOStr) {
|
||||
this.advanceSearchVOStr = advanceSearchVOStr;
|
||||
}
|
||||
|
||||
public String getAdvanceSearchStr() {
|
||||
return advanceSearchStr;
|
||||
}
|
||||
|
||||
public void setAdvanceSearchStr(String advanceSearchStr) {
|
||||
this.advanceSearchStr = advanceSearchStr;
|
||||
}
|
||||
|
||||
public String getOrgName() {
|
||||
return orgName;
|
||||
}
|
||||
|
||||
public void setOrgName(String orgName) {
|
||||
this.orgName = orgName;
|
||||
}
|
||||
|
||||
public List<String> getMenuAllChildrenIdList() {
|
||||
return menuAllChildrenIdList;
|
||||
}
|
||||
|
||||
public void setMenuAllChildrenIdList(List<String> menuAllChildrenIdList) {
|
||||
this.menuAllChildrenIdList = menuAllChildrenIdList;
|
||||
}
|
||||
|
||||
public String getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(String userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String getPaixu() {
|
||||
return paixu;
|
||||
}
|
||||
|
||||
public void setPaixu(String paixu) {
|
||||
this.paixu = paixu;
|
||||
}
|
||||
|
||||
public String getShunxu() {
|
||||
return shunxu;
|
||||
}
|
||||
|
||||
public void setShunxu(String shunxu) {
|
||||
this.shunxu = shunxu;
|
||||
}
|
||||
|
||||
public String getSql() {
|
||||
return sql;
|
||||
}
|
||||
|
||||
public void setSql(String sql) {
|
||||
this.sql = sql;
|
||||
}
|
||||
}
|
||||
+4
@@ -154,6 +154,8 @@ public class SarStandardsInfo extends BaseEntity {
|
||||
@TableField(exist = false)
|
||||
private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
|
||||
@TableField(exist = false)
|
||||
private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
|
||||
@TableField(exist = false)
|
||||
private String sarStandAttrEOStr; //新增修改时属性表信息
|
||||
@TableField(exist = false)
|
||||
private String menuId; //目录ID
|
||||
@@ -187,5 +189,7 @@ public class SarStandardsInfo extends BaseEntity {
|
||||
@TableField(exist = false)
|
||||
private String putTime2;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String standSystemName;
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
|
||||
|
||||
List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
|
||||
|
||||
List<SarStandardsInfo> getStandInfoByList(String limit);
|
||||
|
||||
SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
|
||||
|
||||
public void attrInfoDetails (SarStandardsInfo row) throws Exception;
|
||||
|
||||
+74
-2
@@ -32,6 +32,7 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
|
||||
import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
|
||||
import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
|
||||
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
|
||||
import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService;
|
||||
import com.adc.da.slrs.sarStandPutTime.dao.SarStandPutTimeDao;
|
||||
import com.adc.da.slrs.sarStandPutTime.entity.SarStandPutTime;
|
||||
import com.adc.da.slrs.sarStandVal.dao.SarStandValDao;
|
||||
@@ -47,6 +48,8 @@ import com.adc.da.sys.common.SelectionResult;
|
||||
import com.adc.da.sys.constant.ValueStateEnum;
|
||||
import com.adc.da.sys.dao.DicTypeEODao;
|
||||
import com.adc.da.sys.entity.DicTypeEO;
|
||||
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
|
||||
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
|
||||
import com.adc.da.util.LoginUserUtil;
|
||||
import com.adc.da.util.UUIDUtils;
|
||||
import com.adc.da.utils.util.*;
|
||||
@@ -96,6 +99,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
@Autowired
|
||||
private ITsResourceService sarMenuEOService;
|
||||
|
||||
@Autowired
|
||||
private ISarMenuStandardService sarMenuStandardService;
|
||||
|
||||
@Autowired
|
||||
private SarSarAccessInfoDao sarSarAccessInfoEODao;
|
||||
|
||||
@@ -114,6 +120,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
@Autowired
|
||||
private ISarSarAccessService sarSarAccessEOService;
|
||||
|
||||
@Autowired
|
||||
private ISarStandMenuService sarStandMenuService;
|
||||
|
||||
@Autowired
|
||||
private ISarLawsInfoService sarLawsInfoEOService;
|
||||
|
||||
@@ -277,10 +286,61 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
}
|
||||
getAttrMap.putAll(newMap);
|
||||
}
|
||||
|
||||
if (getAttrMap != null && !getAttrMap.isEmpty()) {
|
||||
row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
|
||||
}
|
||||
|
||||
row.setAttrInfoMap(getAttrMap);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private Map<String, Object> transformUpperCase(Map<String, Object> orgMap) {
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
|
||||
for (Map.Entry<String, Object> entry : orgMap.entrySet()) {
|
||||
String newKey = entry.getKey().toLowerCase();
|
||||
resultMap.put(newKey, orgMap.get(entry.getKey()));
|
||||
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && !InitStandAttrUtil.fileFieldList.isEmpty() && InitStandAttrUtil.fileFieldList.contains(entry.getKey())) {
|
||||
String value = entry.getValue().toString();
|
||||
if (StringUtils.isNotBlank(value)) {
|
||||
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
|
||||
if(!fileObj.isEmpty()){
|
||||
resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
public void attrInfoShowDetails(List<SarStandardsInfo> sarlist) throws Exception {
|
||||
for (SarStandardsInfo row : sarlist) {
|
||||
attrInfoDetails(row);
|
||||
Map<String, Object> getAttrMap = row.getAttrInfoMap();
|
||||
if (getAttrMap != null && getAttrMap.size() > 0) {
|
||||
for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
|
||||
String name = entry.getKey();
|
||||
String value = "";
|
||||
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
|
||||
value = entry.getValue().toString();
|
||||
if (StringUtils.isNotBlank(value)) {
|
||||
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
|
||||
entry.setValue(fileObj);
|
||||
}
|
||||
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
|
||||
value = entry.getValue().toString();
|
||||
List<String> valArr = Arrays.asList(value.split(","));
|
||||
value = dicTypeEODao.getDicNamesByCodes(valArr);
|
||||
entry.setValue(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception {
|
||||
for (SarStandardsInfo row : sarlist) {
|
||||
attrInfoDetails(row);
|
||||
@@ -504,11 +564,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
public void createStandFile(String standId, Map<String, String> fileMap) throws Exception {
|
||||
if (fileMap != null && fileMap.size() > 0) {
|
||||
List<SarStandFile> standFileList = new ArrayList<>();
|
||||
List<AttFileEO> fileList = new ArrayList<>();
|
||||
for (Map.Entry<String, String> entry : fileMap.entrySet()) {
|
||||
String value = entry.getValue();
|
||||
String field = entry.getKey();
|
||||
if (StringUtils.isNotBlank(value)) {
|
||||
List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(value);
|
||||
fileList = attFileEOService.getMultiFileInfos(value);
|
||||
if (fileList != null && !fileList.isEmpty()) {
|
||||
createStandFileAppend(standId, field, fileList, standFileList);
|
||||
}
|
||||
@@ -1768,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
return strhours;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SarStandardsInfo> getStandInfoByList(String limit){
|
||||
return dao.queryStandInfoByList(Integer.valueOf(limit));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增过程中验证标准号
|
||||
*
|
||||
@@ -1790,11 +1856,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
||||
if (resultlist.size() > 0) {
|
||||
List<SarStandardsInfo> sarStandardsInfoEOList = new ArrayList<>();
|
||||
sarStandardsInfoEOList.add(resultlist.get(0));
|
||||
attrInfoShow(sarStandardsInfoEOList);
|
||||
attrInfoShowDetails(sarStandardsInfoEOList);
|
||||
sarStandardsInfoEO = sarStandardsInfoEOList.get(0);
|
||||
}
|
||||
// 查询纳入清单的国家地区
|
||||
if (sarStandardsInfoEO != null) {
|
||||
if(sarStandardsInfoEO.getStandSystem() != null){
|
||||
SarMenuStandard menu = sarMenuStandardService.selectMenuById(sarStandardsInfoEO.getStandSystem());
|
||||
if(menu != null){
|
||||
sarStandardsInfoEO.setStandSystemName(menu.getMenuName() == null ? "" : menu.getMenuName());
|
||||
}
|
||||
}
|
||||
String accessCountry = sarSarAccessEOService.getCountryByRes(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND");
|
||||
sarStandardsInfoEO.setAccessCountry(accessCountry);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.adc.da.slrs.sarTree.controller;
|
||||
|
||||
import com.adc.da.base.web.BaseController;
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.sarRole.entity.TsRole;
|
||||
import com.adc.da.slrs.sarTree.entity.SarModel;
|
||||
import com.adc.da.slrs.sarTree.entity.SarVPPS;
|
||||
import com.adc.da.slrs.sarTree.service.SarModelService;
|
||||
import com.adc.da.slrs.sarTree.service.SarVPPSService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@Api(tags = "|获取树列表|")
|
||||
@RequestMapping("/api/sarVpps")
|
||||
public class TreeController extends BaseController<SarVPPS> {
|
||||
|
||||
@Autowired
|
||||
private SarVPPSService sarVPPSService;
|
||||
@Autowired
|
||||
private SarModelService sarModelService;
|
||||
|
||||
@ApiOperation("VPPS树列表")
|
||||
@GetMapping("/tree/list1")
|
||||
public ResponseMessage<List<SarVPPS>> getTreeList1(){
|
||||
List<SarVPPS> sarVpps = sarVPPSService.findTreeAll();
|
||||
return Result.success(sarVpps);
|
||||
}
|
||||
|
||||
@ApiOperation("模块结构单元树列表")
|
||||
@GetMapping("/tree/list2")
|
||||
public ResponseMessage<List<SarModel>> getTreeList2(){
|
||||
List<SarModel> sarVpps = sarModelService.findTreeAll();
|
||||
return Result.success(sarVpps);
|
||||
}
|
||||
|
||||
// @ApiOperation("根据角色名筛选角色")
|
||||
// @GetMapping("/tree/node/list")
|
||||
// public ResponseMessage<Map<String,Object>> getTreeNodeList(String code){
|
||||
// Map<String,Object> map = sarVPPSService.findTreeAll(code);
|
||||
// return Result.success(map);
|
||||
// }
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.adc.da.slrs.sarTree.dao;
|
||||
|
||||
import com.adc.da.slrs.sarTree.entity.SarModel;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import java.util.List;
|
||||
|
||||
public interface SarModelDao extends BaseMapper<SarModel> {
|
||||
|
||||
// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)")
|
||||
// List<SarModel> findTreeAll();
|
||||
// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}")
|
||||
// List<SarModel> selectList(@Param("pid") String pid);
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.adc.da.slrs.sarTree.dao;
|
||||
|
||||
import com.adc.da.slrs.sarTree.entity.SarVPPS;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import java.util.List;
|
||||
|
||||
public interface SarVPPSDao extends BaseMapper<SarVPPS> {
|
||||
|
||||
@Select("select id,pid,CONCAT(VPPS_CODE,CHINESE_NAME,ENGLISH_NAME) name,code from sar_vpps_tree where 1=1 and isnull(pid)")
|
||||
List<SarVPPS> findTreeAll();
|
||||
@Select("select id,pid,CONCAT(VPPS_CODE,CHINESE_NAME,ENGLISH_NAME) name,code from sar_vpps_tree where 1=1 and pid = #{pid}")
|
||||
List<SarVPPS> selectList(@Param("pid") String pid);
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.adc.da.slrs.sarTree.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.data.annotation.Transient;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarModel对象", description="")
|
||||
public class SarModel extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String pid;
|
||||
|
||||
private String model;
|
||||
|
||||
private String features;
|
||||
|
||||
private String delFlag;
|
||||
|
||||
@Transient
|
||||
private List<SarModel> children;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.adc.da.slrs.sarTree.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.data.annotation.Transient;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarVPPS对象", description="")
|
||||
@TableName(value = "sar_vpps_tree")
|
||||
public class SarVPPS extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String id;
|
||||
|
||||
private String vppsCode;
|
||||
|
||||
private String pid;
|
||||
|
||||
private String code;
|
||||
|
||||
private String chineseName;
|
||||
|
||||
private String englishName;
|
||||
|
||||
private String delFlag;
|
||||
|
||||
@Transient
|
||||
private List<SarVPPS> children;
|
||||
|
||||
@Transient
|
||||
private String name;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.adc.da.slrs.sarTree.service;
|
||||
|
||||
import com.adc.da.slrs.sarTree.entity.SarModel;
|
||||
import com.adc.da.slrs.sarTree.entity.SarVPPS;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface SarModelService {
|
||||
|
||||
List<SarModel> findTreeAll();
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.adc.da.slrs.sarTree.service;
|
||||
|
||||
import com.adc.da.slrs.sarTree.entity.SarVPPS;
|
||||
import java.util.List;
|
||||
|
||||
public interface SarVPPSService {
|
||||
|
||||
List<SarVPPS> findTreeAll();
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.adc.da.slrs.sarTree.service.impl;
|
||||
|
||||
import com.adc.da.slrs.sarTree.dao.SarModelDao;
|
||||
import com.adc.da.slrs.sarTree.entity.SarModel;
|
||||
import com.adc.da.slrs.sarTree.service.SarModelService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class SarModelServiceImpl implements SarModelService {
|
||||
private static final Logger logger = LoggerFactory.getLogger(SarModelServiceImpl.class);
|
||||
|
||||
@Autowired
|
||||
private SarModelDao sarModelDao;
|
||||
|
||||
@Override
|
||||
public List<SarModel> findTreeAll() {
|
||||
//查询父级都为null的数据
|
||||
QueryWrapper<SarModel> qw = new QueryWrapper<>();
|
||||
qw.isNull("pid");
|
||||
List<SarModel> sarVppsList = sarModelDao.selectList(qw);
|
||||
for (SarModel sarVppsOne:sarVppsList) {
|
||||
sarVppsOne.setChildren(getChildren(sarVppsOne));
|
||||
}
|
||||
return sarVppsList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归调用获取子节点
|
||||
* @param parent：父节点
|
||||
* @return List<TsResource>
|
||||
*/
|
||||
private List<SarModel> getChildren(SarModel parent){
|
||||
String pid = parent.getId();
|
||||
QueryWrapper<SarModel> qw = new QueryWrapper<>();
|
||||
qw.eq("pid",parent.getId());
|
||||
List<SarModel> children=sarModelDao.selectList(qw);
|
||||
for(SarModel sarVppsOne:children){
|
||||
sarVppsOne.setChildren(getChildren((sarVppsOne)));
|
||||
}
|
||||
return children;
|
||||
}
|
||||
}
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
package com.adc.da.slrs.sarTree.service.impl;
|
||||
|
||||
import com.adc.da.slrs.sarResource.entity.TsResource;
|
||||
import com.adc.da.slrs.sarTree.dao.SarVPPSDao;
|
||||
import com.adc.da.slrs.sarTree.entity.SarVPPS;
|
||||
import com.adc.da.slrs.sarTree.service.SarVPPSService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class SarVPPSServiceImpl implements SarVPPSService {
|
||||
private static final Logger logger = LoggerFactory.getLogger(SarVPPSServiceImpl.class);
|
||||
|
||||
@Autowired
|
||||
private SarVPPSDao sarVPPSDao;
|
||||
|
||||
@Override
|
||||
public List<SarVPPS> findTreeAll() {
|
||||
//查询父级都为null的数据
|
||||
QueryWrapper<SarVPPS> qw = new QueryWrapper<>();
|
||||
qw.isNull("pid");
|
||||
List<SarVPPS> sarVppsList = sarVPPSDao.selectList(qw);
|
||||
for (SarVPPS sarVppsOne:sarVppsList) {
|
||||
sarVppsOne.setChildren(getChildren(sarVppsOne));
|
||||
}
|
||||
return sarVppsList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归调用获取子节点
|
||||
* @param parent：父节点
|
||||
* @return List<TsResource>
|
||||
*/
|
||||
private List<SarVPPS> getChildren(SarVPPS parent){
|
||||
String pid = parent.getId();
|
||||
QueryWrapper<SarVPPS> qw = new QueryWrapper<>();
|
||||
qw.eq("pid",parent.getId());
|
||||
List<SarVPPS> children=sarVPPSDao.selectList(qw);
|
||||
for(SarVPPS sarVppsOne:children){
|
||||
sarVppsOne.setChildren(getChildren((sarVppsOne)));
|
||||
}
|
||||
return children;
|
||||
}
|
||||
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.adc.da.slrs.sarVppsTree.controller;
|
||||
|
||||
|
||||
import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.adc.da.base.web.BaseController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
@RestController
|
||||
@Api(tags = "福田标准法规--标准法规库-Vpps树结构")
|
||||
@RequestMapping("/${restPath}/sarVppsTree")
|
||||
public class SarVppsTreeController extends BaseController<SarVppsTree> {
|
||||
|
||||
@Autowired
|
||||
private ISarVppsTreeService iSarVppsTreeService;
|
||||
|
||||
@ApiOperation("查询所有资源")
|
||||
@GetMapping("/list")
|
||||
public ResponseMessage<List<SarVppsTree>> getAll(SarVppsTree sarVppsTree){
|
||||
List<SarVppsTree> tsResources = iSarVppsTreeService.getAll(sarVppsTree);
|
||||
return Result.success(tsResources);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.adc.da.slrs.sarVppsTree.dao;
|
||||
|
||||
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
public interface SarVppsTreeDao extends BaseMapper<SarVppsTree> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.adc.da.slrs.sarVppsTree.entity;
|
||||
|
||||
import com.adc.da.base.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Accessors(chain = true)
|
||||
@ApiModel(value="SarVppsTree对象", description="")
|
||||
public class SarVppsTree extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId("ID")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "VPPS编码")
|
||||
@TableField("VPPS_CODE")
|
||||
private String vppsCode;
|
||||
|
||||
@ApiModelProperty(value = "父级id")
|
||||
@TableField("PID")
|
||||
private String pid;
|
||||
|
||||
@ApiModelProperty(value = "编码")
|
||||
@TableField("CODE")
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty(value = "中文名称")
|
||||
@TableField("CHINESE_NAME")
|
||||
private String chineseName;
|
||||
|
||||
@ApiModelProperty(value = "中文名称")
|
||||
@TableField("ENGLISH_NAME")
|
||||
private String englishName;
|
||||
|
||||
@ApiModelProperty(value = "删除标识 1：未删除 2：已删除")
|
||||
@TableField("DEL_FLAG")
|
||||
private String delFlag;
|
||||
|
||||
@ApiModelProperty(value = "排序序号")
|
||||
@TableField("SORT")
|
||||
private Integer sort;
|
||||
|
||||
@ApiModelProperty(value = "子菜单")
|
||||
@TableField(exist = false)
|
||||
private List<SarVppsTree> children;
|
||||
|
||||
@ApiModelProperty(value = "上级菜单名称")
|
||||
@TableField(exist = false)
|
||||
private String parentIdsName;
|
||||
|
||||
@TableField(exist=false)
|
||||
private List<String> roleIds;
|
||||
|
||||
@TableField(exist=false)
|
||||
private List<String> childMenuIds;
|
||||
|
||||
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.adc.da.slrs.sarVppsTree.service;
|
||||
|
||||
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
public interface ISarVppsTreeService extends IService<SarVppsTree> {
|
||||
|
||||
List<SarVppsTree> getAll(SarVppsTree sarVppsTree);
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.adc.da.slrs.sarVppsTree.service.impl;
|
||||
|
||||
import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree;
|
||||
import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao;
|
||||
import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-07-15
|
||||
*/
|
||||
@Service
|
||||
public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsTree> implements ISarVppsTreeService {
|
||||
|
||||
/**
|
||||
* 查询所有菜单
|
||||
* @param sarVppsTree
|
||||
*/
|
||||
@Override
|
||||
public List<SarVppsTree> getAll(SarVppsTree sarVppsTree) {
|
||||
QueryWrapper<SarVppsTree> tsResourceQueryWrapper=new QueryWrapper<>();
|
||||
tsResourceQueryWrapper.isNull("PID");
|
||||
List<SarVppsTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
|
||||
for(SarVppsTree tree:list){
|
||||
tree.setChildren(recursionGetChildren((tree)));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 递归调用获取子节点
|
||||
* @param parent：父节点
|
||||
* @return List<SarMenu>
|
||||
*/
|
||||
private List<SarVppsTree> recursionGetChildren(SarVppsTree parent){
|
||||
QueryWrapper<SarVppsTree> sarMenuQueryWrapper=new QueryWrapper<>();
|
||||
sarMenuQueryWrapper.orderByAsc("SORT");
|
||||
sarMenuQueryWrapper.eq("PID",parent.getId());
|
||||
List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
|
||||
for(SarVppsTree sarMenu:children){
|
||||
sarMenu.setChildren(recursionGetChildren((sarMenu)));
|
||||
}
|
||||
return children;
|
||||
}
|
||||
}
|
||||
+132
@@ -0,0 +1,132 @@
|
||||
package com.adc.da.slrs.standardSplit.controller;
|
||||
|
||||
import com.adc.da.base.web.BaseController;
|
||||
import com.adc.da.http.PageInfo;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
|
||||
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService;
|
||||
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsTableEOService;
|
||||
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService;
|
||||
import com.adc.da.util.http.ResponseMessage;
|
||||
import com.adc.da.util.http.Result;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/${restPath}/lawss/sarFileSplitItemsVal")
|
||||
@Api(description = "|SarFileSplitItemsValEO|")
|
||||
public class SarFileSplitItemsValEOController extends BaseController<SarFileSplitItemsValEO> {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOController.class);
|
||||
|
||||
@Autowired
|
||||
private SarFileSplitItemsValEOService sarFileSplitItemsValEOService;
|
||||
|
||||
@Autowired
|
||||
private SarFileSplitItemsTableEOService sarFileSplitItemsTableEOService;
|
||||
|
||||
@Autowired
|
||||
private SarFileSplitItemsEOService sarFileSplitItemsEOService;
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsValEO|分页查询")
|
||||
@GetMapping("/page")
|
||||
//401问题2021-03-31暂时注释掉 liuhuiwen
|
||||
// @RequiresPermissions("lawss:sarFileSplitItemsVal:page")
|
||||
public ResponseMessage<PageInfo<SarFileSplitItemsValEO>> page(SarFileSplitItemsValEOPage page) throws Exception {
|
||||
page.setOrderBy("modify_time desc");
|
||||
List<SarFileSplitItemsValEO> rows = sarFileSplitItemsValEOService.queryByPage(page);
|
||||
return Result.success(getPageInfo(page.getPager(), rows));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsValEO|查询")
|
||||
@GetMapping("/getItemsValList")
|
||||
// @RequiresPermissions("lawss:sarFileSplitItemsVal:list")
|
||||
public ResponseMessage<List<SarFileSplitItemsValEO>> list(SarFileSplitItemsValEOPage page) throws Exception {
|
||||
page.setOrderBy("DISPLAY_SEQ,ID");
|
||||
List<SarFileSplitItemsValEO> getList = sarFileSplitItemsValEOService.queryByList(page);
|
||||
if (getList != null && !getList.isEmpty()) {
|
||||
for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) {
|
||||
String imgPath = sarFileSplitItemsValEO.getItemContent();
|
||||
if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) {
|
||||
String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length());
|
||||
sarFileSplitItemsValEO.setImgName(imgName);
|
||||
}
|
||||
/*else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) {
|
||||
SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage();
|
||||
tablePage.setItemsValId(sarFileSplitItemsValEO.getId());
|
||||
List<SarFileSplitItemsTableEO> tableList = sarFileSplitItemsTableEOService.queryByList(tablePage);
|
||||
List<SarFileSplitItemsTableEO> tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage);
|
||||
sarFileSplitItemsValEO.setTableList(tableList);
|
||||
if (tableListRow != null && !tableListRow.isEmpty()) {
|
||||
List<List<SarFileSplitItemsTableEO>> getTableList = new ArrayList<>();
|
||||
for (int i=1; i <= tableListRow.size();i++) {
|
||||
List<SarFileSplitItemsTableEO> rowList = new ArrayList<>();
|
||||
for (int j=0; j < tableList.size();j++) {
|
||||
if (tableList.get(j).getRowNum() == i) {
|
||||
rowList.add(tableList.get(j));
|
||||
}
|
||||
}
|
||||
getTableList.add(rowList);
|
||||
}
|
||||
sarFileSplitItemsValEO.setTableListShow(getTableList);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
return Result.success(getList);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsValEO|详情")
|
||||
@GetMapping("/{id}")
|
||||
//401问题2021-03-31暂时注释掉 liuhuiwen
|
||||
// @RequiresPermissions("lawss:sarFileSplitItemsVal:get")
|
||||
public ResponseMessage<SarFileSplitItemsValEO> find(@PathVariable String id) throws Exception {
|
||||
return Result.success(sarFileSplitItemsValEOService.selectByPrimaryKey(id));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsValEO|新增")
|
||||
@PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
|
||||
//401问题2021-03-31暂时注释掉 liuhuiwen
|
||||
// @RequiresPermissions("lawss:sarFileSplitItemsVal:save")
|
||||
public ResponseMessage<SarFileSplitItemsValEO> create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception {
|
||||
sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO);
|
||||
return Result.success(sarFileSplitItemsValEO);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsValEO|修改")
|
||||
@PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
|
||||
//401问题2021-03-31暂时注释掉 liuhuiwen
|
||||
// @RequiresPermissions("lawss:sarFileSplitItemsVal:update")
|
||||
public ResponseMessage<SarFileSplitItemsValEO> update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception {
|
||||
sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO);
|
||||
return Result.success(sarFileSplitItemsValEO);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsValEO|删除")
|
||||
@DeleteMapping("/{id}")
|
||||
//401问题2021-03-31暂时注释掉 liuhuiwen
|
||||
// @RequiresPermissions("lawss:sarFileSplitItemsVal:delete")
|
||||
public ResponseMessage delete(@PathVariable String id) throws Exception {
|
||||
sarFileSplitItemsValEOService.deleteByPrimaryKey(id);
|
||||
logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "|SarFileSplitItemsEO|根据目录查询")
|
||||
@GetMapping("/getSplitItemsByMenu")
|
||||
// @RequiresPermissions("lawss:sarFileSplitItems:page")
|
||||
public ResponseMessage<List<SarFileSplitItemsValEO>> getSplitItemsByMenu(String menuId,String infoId) throws Exception {
|
||||
List<SarFileSplitItemsValEO> getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId);
|
||||
return Result.success(getList);
|
||||
}
|
||||
|
||||
}
|
||||
+4
@@ -3,6 +3,7 @@ package com.adc.da.slrs.standardSplit.controller;
|
||||
import com.adc.da.att.service.IAttFileEOService;
|
||||
import com.adc.da.base.web.BaseController;
|
||||
import com.adc.da.http.PageInfo;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
|
||||
import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService;
|
||||
@@ -118,6 +119,9 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
|
||||
page.setFileSuffixList(suffix.split(","));
|
||||
}
|
||||
List<SarStandFileEO> rows = sarStandFileEOService.getStandFileListByPage(page);
|
||||
for (SarStandFileEO one:rows) {
|
||||
one.setAttId(one.getAttId1());
|
||||
}
|
||||
if (rows != null && !rows.isEmpty()) {
|
||||
for (SarStandFileEO sarStandFileEO : rows) {
|
||||
List<SelectionResult> getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify());
|
||||
|
||||
+2
@@ -30,4 +30,6 @@ public interface SarFileSplitItemsTableEODao extends BaseMapper<SarFileSplitItem
|
||||
|
||||
List<SarFileSplitItemsTableEO> queryItemsTableByMenuId(@Param("idList") List<String> idList);
|
||||
|
||||
List<SarFileSplitItemsTableEO> queryByList(@Param("pager") SarFileSplitItemsTableEOPage pager);
|
||||
|
||||
}
|
||||
|
||||
+10
@@ -36,4 +36,14 @@ public interface SarFileSplitItemsValEODao extends BaseMapper<SarFileSplitItemsV
|
||||
|
||||
List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
|
||||
|
||||
List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
|
||||
|
||||
SarFileSplitItemsValEO selectByPrimaryKey(String id);
|
||||
|
||||
void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
|
||||
|
||||
void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
|
||||
|
||||
void deleteByPrimaryKey(String id);
|
||||
|
||||
}
|
||||
|
||||
@@ -21,6 +21,16 @@ public class SarStandFileEO extends BaseEntity {
|
||||
private String validFlag;
|
||||
private String useModel;
|
||||
private String attId;
|
||||
|
||||
public String getAttId1() {
|
||||
return attId1;
|
||||
}
|
||||
|
||||
public void setAttId1(String attId1) {
|
||||
this.attId1 = attId1;
|
||||
}
|
||||
|
||||
private String attId1;
|
||||
private String resId;
|
||||
private String standId;
|
||||
private String id;
|
||||
|
||||
+12
@@ -8,4 +8,16 @@ import java.util.List;
|
||||
public interface SarFileSplitItemsValEOService {
|
||||
|
||||
List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
|
||||
|
||||
List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
|
||||
|
||||
SarFileSplitItemsValEO selectByPrimaryKey(String id);
|
||||
|
||||
void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
|
||||
|
||||
void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO);
|
||||
|
||||
void deleteByPrimaryKey(String id);
|
||||
|
||||
List<SarFileSplitItemsValEO> getSplitItemsByMenu(String menuId,String infoId);
|
||||
}
|
||||
|
||||
+5
-2
@@ -37,9 +37,9 @@ import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import com.adc.da.person.dao.PersonShareEODao;
|
||||
import com.adc.da.person.dao.PersonCollectEODao;
|
||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||
|
||||
@Service
|
||||
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
||||
public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService {
|
||||
private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class);
|
||||
|
||||
@@ -104,6 +104,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){
|
||||
// 拆分文件主表中插入数据
|
||||
sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
|
||||
@@ -135,7 +136,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
||||
}
|
||||
try {
|
||||
AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId());
|
||||
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
|
||||
//String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
|
||||
String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName();
|
||||
|
||||
InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。
|
||||
XWPFDocument doc = new XWPFDocument(is);
|
||||
@@ -317,6 +319,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
return -1;
|
||||
}
|
||||
if(treeList.size()>0 && messageList.size() > 0){
|
||||
|
||||
+78
-2
@@ -1,9 +1,11 @@
|
||||
package com.adc.da.slrs.standardSplit.service.impl;
|
||||
|
||||
import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao;
|
||||
import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsTableEODao;
|
||||
import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsValEODao;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
|
||||
import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
|
||||
import com.adc.da.slrs.standardSplit.entity.*;
|
||||
import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -11,6 +13,7 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@@ -20,9 +23,82 @@ public class SarFileSplitItemsValEOServiceImpl implements SarFileSplitItemsValEO
|
||||
|
||||
@Autowired
|
||||
private SarFileSplitItemsValEODao sarFileSplitItemsValEODao;
|
||||
@Autowired
|
||||
private SarFileSplitItemsEODao sarFileSplitItemsEODao;
|
||||
@Autowired
|
||||
private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao;
|
||||
|
||||
@Override
|
||||
public List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage) {
|
||||
return sarFileSplitItemsValEODao.queryByList(valEOPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page) {
|
||||
return sarFileSplitItemsValEODao.queryByPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SarFileSplitItemsValEO selectByPrimaryKey(String id) {
|
||||
return sarFileSplitItemsValEODao.selectByPrimaryKey(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) {
|
||||
sarFileSplitItemsValEODao.insertSelective(sarFileSplitItemsValEO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) {
|
||||
sarFileSplitItemsValEODao.updateByPrimaryKeySelective(sarFileSplitItemsValEO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteByPrimaryKey(String id) {
|
||||
sarFileSplitItemsValEODao.deleteByPrimaryKey(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SarFileSplitItemsValEO> getSplitItemsByMenu(String menuId, String infoId) {
|
||||
List<SarFileSplitItemsEO> rows = sarFileSplitItemsEODao.queryItemsByMenuId(menuId);;
|
||||
List<SarFileSplitItemsValEO> getList = new ArrayList<>();
|
||||
if (rows != null && !rows.isEmpty()) {
|
||||
for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) {
|
||||
SarFileSplitItemsValEOPage valpage = new SarFileSplitItemsValEOPage();
|
||||
valpage.setItemId(sarFileSplitItemsEO.getId());
|
||||
valpage.setOrderBy("DISPLAY_SEQ,ID");
|
||||
List<SarFileSplitItemsValEO> getListVal = sarFileSplitItemsValEODao.queryByList(valpage);
|
||||
if (getList != null && !getList.isEmpty()) {
|
||||
for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) {
|
||||
String imgPath = sarFileSplitItemsValEO.getItemContent();
|
||||
if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) {
|
||||
String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length());
|
||||
sarFileSplitItemsValEO.setImgName(imgName);
|
||||
} else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) {
|
||||
SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage();
|
||||
tablePage.setItemsValId(sarFileSplitItemsValEO.getId());
|
||||
List<SarFileSplitItemsTableEO> tableList = sarFileSplitItemsTableEODao.queryByList(tablePage);
|
||||
List<SarFileSplitItemsTableEO> tableListRow = sarFileSplitItemsTableEODao.queryByRowNum(tablePage);
|
||||
sarFileSplitItemsValEO.setTableList(tableList);
|
||||
if (tableListRow != null && !tableListRow.isEmpty()) {
|
||||
List<List<SarFileSplitItemsTableEO>> getTableList = new ArrayList<>();
|
||||
for (int i=1; i <= tableListRow.size();i++) {
|
||||
List<SarFileSplitItemsTableEO> rowList = new ArrayList<>();
|
||||
for (int j=0; j < tableList.size();j++) {
|
||||
if (tableList.get(j).getRowNum() == i) {
|
||||
rowList.add(tableList.get(j));
|
||||
}
|
||||
}
|
||||
getTableList.add(rowList);
|
||||
}
|
||||
sarFileSplitItemsValEO.setTableListShow(getTableList);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
getList.addAll(getListVal);
|
||||
}
|
||||
}
|
||||
return getList;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user