add 添加标准合规评估结果接口

This commit is contained in:
yinglong zhang
2021-06-16 17:03:34 +08:00
parent 469014cdc1
commit 4ffd46b830
30 changed files with 622 additions and 16 deletions
@@ -18,15 +18,15 @@ public class CodeGen {
private static final String PACKAGE_PATH="/adc-da-slrs/src/main";
private static final String AUTHOR="super_liu";
private static final String AUTHOR="zyl";
// x.x.x.x:3306/xxxx --MYSQL
// 192.168.10.140:1521:foton_slrs_test
private static final String DB_IP="127.0.0.1:3306/foton_slrs";
private static final String DB_IP="101.36.227.22:33050/foton_slrs_test";
private static final String DB_USER="root";
private static final String DB_PWD="root";
private static final String DB_PWD="1q2w3e4r";
/**
@@ -3,9 +3,9 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://127.0.0.1:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = root
spring.datasource.password = 1q2w3e4r
#==============================================
# 应用设置
@@ -0,0 +1,23 @@
package com.adc.da.slrs.sarInterpretationStandard.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
/**
* <p>
* 前端控制器
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@RestController
@Api(description = "|SarInterpretationForeignStandard|")
@RequestMapping("/sarInterpretationStandard/sar-interpretation-foreign-standard")
public class SarInterpretationForeignStandardController extends BaseController<SarInterpretationForeignStandard> {
}
@@ -0,0 +1,23 @@
package com.adc.da.slrs.sarInterpretationStandard.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
/**
* <p>
* 前端控制器
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@RestController
@Api(description = "|SarInterpretationNationalStandard|")
@RequestMapping("/sarInterpretationStandard/sar-interpretation-national-standard")
public class SarInterpretationNationalStandardController extends BaseController<SarInterpretationNationalStandard> {
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarInterpretationStandard.dao;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author zyl
* @since 2021-06-16
*/
public interface SarInterpretationForeignStandardDao extends BaseMapper<SarInterpretationForeignStandard> {
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarInterpretationStandard.dao;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author zyl
* @since 2021-06-16
*/
public interface SarInterpretationNationalStandardDao extends BaseMapper<SarInterpretationNationalStandard> {
}
@@ -0,0 +1,41 @@
package com.adc.da.slrs.sarInterpretationStandard.entity;
import com.adc.da.base.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarInterpretationForeignStandard对象", description="")
public class SarInterpretationForeignStandard extends BaseEntity {
private static final long serialVersionUID = 1L;
private String standardNum;
private String standardName;
private String correspondDomesticStandard;
private String specificItem;
private String coreTechnicalRequirement;
private String comparedDomesticStandard;
private String complianceState;
}
@@ -0,0 +1,41 @@
package com.adc.da.slrs.sarInterpretationStandard.entity;
import com.adc.da.base.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarInterpretationNationalStandard对象", description="")
public class SarInterpretationNationalStandard extends BaseEntity {
private static final long serialVersionUID = 1L;
private String standardNum;
private String standardName;
private Integer lastVersionNum;
private String specificItem;
private String coreTechnicalRequirement;
private String comparedWithPrevious;
private String complianceState;
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarInterpretationStandard.service;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author zyl
* @since 2021-06-16
*/
public interface ISarInterpretationForeignStandardService extends IService<SarInterpretationForeignStandard> {
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarInterpretationStandard.service;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author zyl
* @since 2021-06-16
*/
public interface ISarInterpretationNationalStandardService extends IService<SarInterpretationNationalStandard> {
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarInterpretationStandard.service.impl;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
import com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationForeignStandardDao;
import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationForeignStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@Service
public class SarInterpretationForeignStandardServiceImpl extends ServiceImpl<SarInterpretationForeignStandardDao, SarInterpretationForeignStandard> implements ISarInterpretationForeignStandardService {
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarInterpretationStandard.service.impl;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
import com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationNationalStandardDao;
import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationNationalStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@Service
public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<SarInterpretationNationalStandardDao, SarInterpretationNationalStandard> implements ISarInterpretationNationalStandardService {
}
@@ -0,0 +1,112 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.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.sarInterpretationStandard.entity.SarInterpretationForeignStandard;
import com.adc.da.slrs.sarInterpretationStandard.entity.SarInterpretationNationalStandard;
import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationForeignStandardService;
import com.adc.da.slrs.sarInterpretationStandard.service.ISarInterpretationNationalStandardService;
import com.adc.da.slrs.sarProductStand.entity.SarProductStand;
import com.adc.da.slrs.sarProductStand.service.ISarProductStandService;
import com.adc.da.slrs.sarSarAccessInfo.entity.SarSarAccessInfo;
import com.adc.da.slrs.sarSarAccessInfo.service.ISarSarAccessInfoService;
import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationForeignStandardEO;
import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandardEO;
import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO;
import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
import com.adc.da.slrs.sarStandardComplianceProductAssess.service.ISarStandardComplianceProductAssessService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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 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 java.util.List;
import java.util.Map;
import java.util.Set;
/**
* <p>
* 标准法规准入清单详情表 前端控制器
* </p>
*
* @author super_liu
* @since 2021-06-02
*/
@RestController
@Api(tags = "福田标准法规--标准法规库--标准合规评估结果")
@RequestMapping("/${restPath}/sarStandardComplianceAssessResult")
public class SarStandardComplianceAssessResultController extends BaseController<SarSarAccessInfo> {
private static final Logger logger = LoggerFactory.getLogger(SarStandardComplianceAssessResultController.class);
@Autowired
private ISarStandardsInfoService iSarStandardsInfoService;
@Autowired
private ISarStandardComplianceProductAssessService iSarStandardComplianceProductAssessService;
@Autowired
private ISarInterpretationForeignStandardService iSarInterpretationForeignStandardService;
@Autowired
private ISarInterpretationNationalStandardService iSarInterpretationNationalStandardService;
@ApiOperation(value = "条件查询标准清单")
@GetMapping("/standard")
public ResponseMessage<IPage<SarStandardsInfo>> selectStandard(SarStandardsInfoEO eo) throws Exception {
QueryWrapper<SarStandardsInfo> sarStandardsInfoQueryWrapper=new QueryWrapper<>();
if (eo.getStandName() != null) {
sarStandardsInfoQueryWrapper.like("STAND_NAME",eo.getStandName());
}
if (eo.getStandNumber() != null) {
sarStandardsInfoQueryWrapper.like("STAND_NUMBER",eo.getStandNumber());
}
IPage<SarStandardsInfo> iPage=new Page<>(eo.getCurrent(), eo.getSize());
return Result.success(iSarStandardsInfoService.page(iPage,sarStandardsInfoQueryWrapper));
}
@ApiOperation(value = "条件查询标准涉及项目符合性清单")
@GetMapping("/product")
public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
IPage<SarStandardComplianceProductAssess> iPage=new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper=new QueryWrapper<>();
if(eo.getProductName()!=null)queryWrapper.like("product_name",eo.getProductName());
if(eo.getStandardId()!=null)queryWrapper.like("standard_id",eo.getStandardId());
return Result.success(iSarStandardComplianceProductAssessService.page(iPage,queryWrapper));
}
@ApiOperation(value = "条件查询标准涉及国内标准符合性清单")
@GetMapping("/nationalStandard")
public ResponseMessage<IPage<SarInterpretationNationalStandard>> selectNationalStandard(SarInterpretationNationalStandardEO eo) throws Exception {
IPage<SarInterpretationNationalStandard> iPage=new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarInterpretationNationalStandard> queryWrapper=new QueryWrapper<>();
if(eo.getStandardId()!=null)queryWrapper.like("standard_num",eo.getStandardId());
return Result.success(iSarInterpretationNationalStandardService.page(iPage,queryWrapper));
}
@ApiOperation(value = "条件查询标准涉及国内标准符合性清单")
@GetMapping("/foreignStandard")
public ResponseMessage<IPage<SarInterpretationForeignStandard>> selectForeignStandard(SarInterpretationForeignStandardEO eo) throws Exception {
IPage<SarInterpretationForeignStandard> iPage=new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarInterpretationForeignStandard> queryWrapper=new QueryWrapper<>();
if(eo.getStandardId()!=null)queryWrapper.like("standard_num",eo.getStandardId());
return Result.success(iSarInterpretationForeignStandardService.page(iPage,queryWrapper));
}
}
@@ -0,0 +1,12 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Repository
@Mapper
public interface SarStandardComplianceAssessResultDao {
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("条件查询")
public class SarInterpretationForeignStandardEO {
@ApiModelProperty(value = "'标准编号'")
private String standardId;
@ApiModelProperty("页数")
private Integer current=1;
@ApiModelProperty("页内数量")
private Integer size=20;
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("条件查询")
public class SarInterpretationNationalStandardEO {
@ApiModelProperty(value = "'标准编号'")
private String standardId;
@ApiModelProperty("页数")
private Integer current=1;
@ApiModelProperty("页内数量")
private Integer size=20;
}
@@ -0,0 +1,24 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("条件查询")
public class SarStandardComplianceProductAssessEO {
@ApiModelProperty(value = "'项目名称'")
private String productName;
@ApiModelProperty(value = "'标准编号'")
private String standardId;
@ApiModelProperty("页数")
private Integer current=1;
@ApiModelProperty("页内数量")
private Integer size=20;
}
@@ -0,0 +1,27 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.entity;
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;
@Data
@Accessors(chain = true)
@ApiModel(value="SarStandardsInfo对象", description="")
public class SarStandardsInfoEO {
@ApiModelProperty(value = "标准编号")
private String standNumber;
@ApiModelProperty(value = "标准名称")
private String standName;
@ApiModelProperty("页数")
private Integer current=1;
@ApiModelProperty("页内数量")
private Integer size=20;
}
@@ -0,0 +1,11 @@
package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
import com.baomidou.mybatisplus.core.metadata.IPage;
public interface ISarStandardComplianceAssessResult {
IPage<SarStandardsInfo> getSarStandardsInfo();
}
@@ -0,0 +1,23 @@
package com.adc.da.slrs.sarStandardComplianceProductAssess.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
/**
* <p>
* 前端控制器
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@RestController
@Api(description = "|SarStandardComplianceProductAssess|")
@RequestMapping("/sarStandardComplianceProductAssess/sar-standard-compliance-product-assess")
public class SarStandardComplianceProductAssessController extends BaseController<SarStandardComplianceProductAssess> {
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarStandardComplianceProductAssess.dao;
import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author zyl
* @since 2021-06-16
*/
public interface SarStandardComplianceProductAssessDao extends BaseMapper<SarStandardComplianceProductAssess> {
}
@@ -0,0 +1,63 @@
package com.adc.da.slrs.sarStandardComplianceProductAssess.entity;
import com.adc.da.base.entity.BaseEntity;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarStandardComplianceProductAssess对象", description="")
public class SarStandardComplianceProductAssess extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "'产品线'")
private String productLineId;
@ApiModelProperty(value = "'项目id'")
private String productId;
@ApiModelProperty(value = "'项目名称'")
private String productName;
@ApiModelProperty(value = "'标准编号'")
private String standardId;
@ApiModelProperty(value = "'标准章条'")
private String itemsId;
@ApiModelProperty(value = "'标准名称'")
private String standardName;
@ApiModelProperty(value = "1是在产,0是在研")
private Integer state;
@ApiModelProperty(value = "实施时间")
private LocalDateTime implementation_time;
@ApiModelProperty(value = "0是合规,1是不合规")
private Integer complianceState;
private String compliance;
private String nonCompliance;
private String countermeasures;
private LocalDateTime completionTime;
}
@@ -0,0 +1,16 @@
package com.adc.da.slrs.sarStandardComplianceProductAssess.service;
import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author zyl
* @since 2021-06-16
*/
public interface ISarStandardComplianceProductAssessService extends IService<SarStandardComplianceProductAssess> {
}
@@ -0,0 +1,20 @@
package com.adc.da.slrs.sarStandardComplianceProductAssess.service.impl;
import com.adc.da.slrs.sarStandardComplianceProductAssess.entity.SarStandardComplianceProductAssess;
import com.adc.da.slrs.sarStandardComplianceProductAssess.dao.SarStandardComplianceProductAssessDao;
import com.adc.da.slrs.sarStandardComplianceProductAssess.service.ISarStandardComplianceProductAssessService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author zyl
* @since 2021-06-16
*/
@Service
public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl<SarStandardComplianceProductAssessDao, SarStandardComplianceProductAssess> implements ISarStandardComplianceProductAssessService {
}
@@ -124,16 +124,6 @@ public class SarStandardsInfo extends BaseEntity {
@TableField("CITED_STAND")
private String citedStand;
// 新添加字段
@ApiModelProperty(value = "文本状态")
@TableField("TEXT_STATUS")
private String textStatus;
@ApiModelProperty(value = "标准体系")
@TableField("STAND_SYSTEM")
private String standSystem;
// 以下为非表中字段
@TableField(exist = false)
private String collectId; // 收藏表ID
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.SarCompResAssess.dao.SarCompResAssessDao">
</mapper>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationForeignStandardDao">
</mapper>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationNationalStandardDao">
</mapper>
@@ -221,7 +221,7 @@
<!-- 根据目录类型查询最外一层节点 -->
<select id="queryMenuByDis" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarMenu.entity.SarMenu">
select <include refid="Base_Column_List"/> from SAR_MENU
select <include refid="Base_Column_List"/> from sar_menu
where valid_flag = 0
and (parent_id is null or parent_id='1')
<if test='sorDivide != null and sorDivide != "ALL_STAND"' >
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarStandardComplianceProductAssess.dao.SarStandardComplianceProductAssessDao">
</mapper>