Skip to content

I
inspect
提交 7375f0ea authored 作者: 孙洁清's avatar 孙洁清
浏览文件
操作

Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

上级 b2c9fc51 5d8245fd
隐藏空白字符变更
内嵌 并排
正在显示 包含 87 行增加 和 52 行删除
src/main/java/com/zjty/inspect/aop/AopIntercept.java
浏览文件 @ 7375f0ea
......@@ -54,7 +54,7 @@ public class AopIntercept {
String url = "http://"+address+":12345/user/getLogin/"+sessionId;
ServerResponse serverResponse = restTemplate.getForObject(url, ServerResponse.class);
if(serverResponse!=null && serverResponse.getCode()!=200){
ResponseEntity.status(403).build();
ResponseEntity.status(403).body(1);
}
User user = serverResponse.getData();
AuthAnnotation authAnnotation = ((MethodSignature)joinPoint.getSignature()).getMethod().getAnnotation(AuthAnnotation.class);
......@@ -77,7 +77,7 @@ public class AopIntercept {
}
}
}
return ResponseEntity.status(403).build();
return ResponseEntity.status(403).body("f");
}
}
src/main/java/com/zjty/inspect/controller/EvaluationController.java
浏览文件 @ 7375f0ea
......@@ -22,48 +22,50 @@ import java.util.Map;
@RestController
@RequestMapping("/evaluation")
@Api(value = "评估报告管理接口",description = "评估报告管理接口,提供页面的增、删、改、查")
@Api(value = "评估报告管理接口", description = "评估报告管理接口,提供页面的增、删、改、查")
public class EvaluationController {
@Autowired
private EvaluationService evaluationService;
/**
* 新增评估报告
*
* @param evaluation 评估报告
* @return
*/
@PostMapping
@ApiOperation("新增评估报告")
public ResponseEntity rule(@RequestBody Evaluation evaluation){
public ResponseEntity rule(@RequestBody Evaluation evaluation) {
evaluationService.save(evaluation);
return ResponseEntity.ok(200);
}
@ApiOperation("根据用户名查询最新的报告输出")
@GetMapping(value = "/eva")
public ResponseEntity getName(@RequestParam String name,@RequestParam String id) {
if(StringUtils.isEmpty(id)||id.equals("null")){
public ResponseEntity getName(@RequestParam String name, @RequestParam String id) {
if (StringUtils.isEmpty(id) || id.equals("null")) {
Evaluation e = evaluationService.findByName(name);
if(e!=null){
if (e != null) {
AssessmentReport assessmentReport = JSON.parseObject(e.getOutEva(), AssessmentReport.class);
return ResponseEntity.ok(assessmentReport);
}
return ResponseEntity.ok(null);
}
Evaluation evaluation = evaluationService.findById(id);
if(evaluation!=null){
if (evaluation != null) {
AssessmentReport assessmentReport = JSON.parseObject(evaluation.getOutEva(), AssessmentReport.class);
return ResponseEntity.ok(assessmentReport);
}
return ResponseEntity.ok(null);
}
@ApiOperation("根据id查询输入")
@GetMapping(value = "/in/{name}")
//@AuthAnnotation(code = {"000800"})
public ResponseEntity getInName(@PathVariable String name) {
Evaluation evaluation = evaluationService.findById(name);
if(evaluation!=null){
if (evaluation != null) {
Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
return ResponseEntity.ok(reform);
}
......@@ -75,7 +77,7 @@ public class EvaluationController {
@AuthAnnotation(code = {"000800"})
public ResponseEntity getInId(@PathVariable String id) {
Evaluation evaluation = evaluationService.findById(id);
if(evaluation!=null){
if (evaluation != null) {
return ResponseEntity.ok(evaluation);
}
return ResponseEntity.ok(null);
......@@ -85,66 +87,73 @@ public class EvaluationController {
@GetMapping(value = "/in/excel/{id}")
public ResponseEntity exportInName(@PathVariable String id) {
Evaluation evaluation = evaluationService.findById(id);
if(evaluation!=null){
if (evaluation != null) {
List<ExcelDataTemp> excelDataTemp = ExcelUtil.parseExcel2Entity(evaluation);
return ResponseEntity.ok(excelDataTemp);
}else{
} else {
return ResponseEntity.ok(new ArrayList<ExcelDataTemp>());
}
}
/**
* 修改评估报告
*
* @param evaluation 规则封装
* @param id id
* @param id id
* @return
*/
@PostMapping(value = "/{id}")
@ApiOperation("修改评估报告")
@AuthAnnotation(code = {"000800"})
public ResponseEntity update(@RequestBody Evaluation evaluation,@PathVariable String id){
public ResponseEntity update(@RequestBody Evaluation evaluation, @PathVariable String id) {
evaluation.setId(id);
evaluationService.update(evaluation);
return ResponseEntity.ok(200);
}
/**
* 根据id删除评估报告
*
* @param id id
* @return
*/
@ApiOperation("根据id删除评估报告")
@DeleteMapping(value = "/{id}")
@AuthAnnotation(code = {"000800"})
public ResponseEntity deleteById(@PathVariable String id){
public ResponseEntity deleteById(@PathVariable String id) {
evaluationService.delete(id);
return ResponseEntity.ok(200);
}
/**
* 分页+多条件查询
*
* @param searchMap 查询条件封装
* @param page 页码
* @param size 页大小
* @param page 页码
* @param size 页大小
* @return 分页结果
*/
@ApiOperation("分页查询页面列表")
@ApiImplicitParams({
@ApiImplicitParam(name="page",value = "页码",required=true,paramType="path",dataType="int"),
@ApiImplicitParam(name="size",value = "每页记录数",required=true,paramType="path",dataType="int")
@ApiImplicitParam(name = "page", value = "页码", required = true, paramType = "path", dataType = "int"),
@ApiImplicitParam(name = "size", value = "每页记录数", required = true, paramType = "path", dataType = "int")
})
@RequestMapping(value="/search/{page}/{size}",method= RequestMethod.POST)
@RequestMapping(value = "/search/{page}/{size}", method = RequestMethod.POST)
@AuthAnnotation(code = {"000800"})
public ResponseEntity findSearch(@RequestBody Map searchMap , @PathVariable int page, @PathVariable int size){
public ResponseEntity findSearch(@RequestBody Map searchMap, @PathVariable int page, @PathVariable int size) {
Page<Evaluation> pageList = evaluationService.findSearch(searchMap, page, size);
return ResponseEntity.ok(new PageResult<Evaluation>(pageList.getTotalElements(), pageList.getContent()) );
return ResponseEntity.ok(new PageResult<Evaluation>(pageList.getTotalElements(), pageList.getContent()));
}
/**
* 修改评估报告
*
* @param id id
* @return
*/
@GetMapping(value = "/bg/{id}")
@ApiOperation("修改评估报告")
public ResponseEntity findall(@PathVariable String id){
public ResponseEntity findall(@PathVariable String id) {
Evaluation evaluation = evaluationService.findById(id);
Map<String, String> wps = WpsUtil.createWps(evaluation);
return ResponseEntity.ok(wps);
......
src/main/java/com/zjty/inspect/enums/LanguageEnum.java
浏览文件 @ 7375f0ea
......@@ -24,6 +24,9 @@ public enum LanguageEnum {
QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔"),
JAVASCRIPT(13,"JavaScript"),
HTML(14,"HTML"),
JSP(15,"JSP"),
NET(16,".NET"),
;
private Integer code;
......
src/main/java/com/zjty/inspect/inspect/Inspector.java
浏览文件 @ 7375f0ea
......@@ -203,6 +203,9 @@ public class Inspector {
* 配置文件的一个类型，xml文件
*/
if ("xml".equals(entry.getKey())) {
List<Path> value = entry.getValue();
for (Path path : entry.getValue()) {
if (path.getFileName().endsWith("pom.xml")) {
try {
......@@ -224,6 +227,8 @@ public class Inspector {
}
}
}
}
}
//指定后缀到文件匹配关键字
......@@ -267,6 +272,7 @@ public class Inspector {
mostStatus = language.getCode();
maxnum = entry.getValue().getNumber();
}
}
//设置语言
report.setLanguage(most == null ? LanguageEnum.NONE.getCode() : mostStatus);
......
src/main/java/com/zjty/inspect/service/impl/InspectServiceImpl.java
浏览文件 @ 7375f0ea
......@@ -53,10 +53,15 @@ public class InspectServiceImpl implements InspectService {
suffixLanguageMapping.put("vue", LanguageEnum.JAVASCRIPT);
suffixLanguageMapping.put("cpp", LanguageEnum.C);
suffixLanguageMapping.put("py", LanguageEnum.PYTHON);
suffixLanguageMapping.put("jsp", LanguageEnum.JAVA);
suffixLanguageMapping.put("jsp", LanguageEnum.JSP);
suffixLanguageMapping.put("go", LanguageEnum.GO);
suffixLanguageMapping.put("js", LanguageEnum.JAVASCRIPT);
suffixLanguageMapping.put("html", LanguageEnum.HTML);
suffixLanguageMapping.put("php",LanguageEnum.PHP);
suffixLanguageMapping.put("vbp",LanguageEnum.VB);
suffixLanguageMapping.put("rs",LanguageEnum.RUST);
suffixLanguageMapping.put("dpk",LanguageEnum.DELPHI);
//构造成员变量
inspector.setInspectParameter(inspectParameter);
//构造报告vo
......
src/main/java/com/zjty/inspect/utils/WpsUtil.java
浏览文件 @ 7375f0ea
......@@ -71,7 +71,8 @@ public class WpsUtil {
Browser browser = reform.getBrowser();
List<BaseDes> compatibleBrowsers = browser.getCompatibleBrowsers();
for (int i = 0; i < compatibleBrowsers.size(); i++) {
keyValue.put("compatibleBrowsers"+i+1, compatibleBrowsers.get(i).getName());
int i1 = i + 1;
keyValue.put("compatibleBrowsers"+i1, compatibleBrowsers.get(i).getName());
}
List<BaseDes> browserPlugs = browser.getBrowserPlugs();
......@@ -81,18 +82,22 @@ public class WpsUtil {
Middleware middleware = reform.getMiddleware();
for (int i = 0; i < middleware.getMiddlewareEnums().size(); i++) {
keyValue.put("middleware"+i+1, middleware.getMiddlewareEnums().get(i).getName());
int i1 = i + 1;
keyValue.put("middleware"+i1, middleware.getMiddlewareEnums().get(i).getName());
}
List<OtherApi> otherApis = middleware.getOtherApis();
for (int i = 0; i < otherApis.size(); i++) {
keyValue.put("otherApi"+i+1, otherApis.get(i).getApiName());
int i1 = i + 1;
keyValue.put("otherApi"+i1, otherApis.get(i).getApiName());
}
for (int i = 0; i < middleware.getMicroServices().size(); i++) {
keyValue.put("microService"+i+1, middleware.getMicroServices().get(i).getName());
int i1 = i + 1;
keyValue.put("microService"+i1, middleware.getMicroServices().get(i).getName());
}
Database database1 = reform.getDatabase();
for (int i = 0; i < database1.getDatabaseType().size(); i++) {
keyValue.put("database"+i+1, database1.getDatabaseType().get(i).getName());
int i1 = i + 1;
keyValue.put("database"+i1, database1.getDatabaseType().get(i).getName());
}
keyValue.put("databaseView", flipYesOrNo(database1.getView()));
keyValue.put("databaseStorage", flipYesOrNo(database1.getStorage()));
......@@ -114,19 +119,24 @@ public class WpsUtil {
DevelopLanguageSystem developLanguageSystem = reform.getDevelopLanguageSystem();
keyValue.put("language",developLanguageSystem.getName());
for (int i = 0; i < developLanguageSystem.getDevFrameworks().size(); i++) {
keyValue.put("devFrameworks"+i+1, developLanguageSystem.getDevFrameworks().get(i).getName());
int i1 = i + 1;
keyValue.put("devFrameworks"+i1, developLanguageSystem.getDevFrameworks().get(i).getName());
}
for (int i = 0; i < developLanguageSystem.getFontDevTechnologies().size(); i++) {
keyValue.put("fontDevTechnologies"+i+1, developLanguageSystem.getFontDevTechnologies().get(i).getName());
int i1 = i + 1;
keyValue.put("fontDevTechnologies"+i1, developLanguageSystem.getFontDevTechnologies().get(i).getName());
}
for (int i = 0; i < developLanguageSystem.getCsDevTechnologies().size(); i++) {
keyValue.put("csDevTechnologies"+i+1, developLanguageSystem.getCsDevTechnologies().get(i).getName());
int i1 = i + 1;
keyValue.put("csDevTechnologies"+i1, developLanguageSystem.getCsDevTechnologies().get(i).getName());
}
for (int i = 0; i < developLanguageSystem.getOpGAs().size(); i++) {
keyValue.put("opGAs"+i+1, developLanguageSystem.getOpGAs().get(i).getName());
int i1 = i + 1;
keyValue.put("opGAs"+i1, developLanguageSystem.getOpGAs().get(i).getName());
}
for (int i = 0; i < developLanguageSystem.getDevLanguages().size(); i++) {
keyValue.put("devLanguages"+i+1, developLanguageSystem.getDevLanguages().get(i).getName());
int i1 = i + 1;
keyValue.put("devLanguages"+i1, developLanguageSystem.getDevLanguages().get(i).getName());
}
LocalSystemDep localSystemDep = reform.getLocalSystemDep();
......@@ -155,14 +165,16 @@ public class WpsUtil {
keyValue.put("technologyDes",technologyList.getDes());
List<TechnologyReport> technologyReports = technologyList.getTechnologyReports();
for (int i = 0; i < technologyList.getTechnologyReports().size(); i++) {
keyValue.put("technology"+i+1, technologyReports.get(i).getTechnology());
int i2 = i + 1;
keyValue.put("technology"+i2, technologyReports.get(i).getTechnology());
for (int i1 = 0; i1 < technologyReports.get(i).getTechnologyContents().size(); i1++) {
int i3 = i1 + 1;
TechnologyContent technologyContent = technologyReports.get(i).getTechnologyContents().get(i1);
keyValue.put("technologyContentLocal"+i+1+"-"+i1+1, technologyContent.getLocal());
keyValue.put("technologyContentKeyWord"+i+1+"-"+i1+1, technologyContent.getKeyWord());
keyValue.put("technologyContentFile"+i+1+"-"+i1+1, technologyContent.getFile());
keyValue.put("technologyContentPosition"+i+1+"-"+i1+1, technologyContent.getPosition());
keyValue.put("technologyContentStrategy"+i+1+"-"+i1+1, getMode(technologyContent.getStrategy()));
keyValue.put("technologyContentLocal"+i2+"-"+i3, technologyContent.getLocal());
keyValue.put("technologyContentKeyWord"+i2+"-"+i3, technologyContent.getKeyWord());
keyValue.put("technologyContentFile"+i2+"-"+i3, technologyContent.getFile());
keyValue.put("technologyContentPosition"+i2+"-"+i3, technologyContent.getPosition());
keyValue.put("technologyContentStrategy"+i2+"-"+i3, getMode(technologyContent.getStrategy()));
}
}
for (TechnologyReport technologyReport : technologyReports) {
......@@ -204,26 +216,26 @@ public class WpsUtil {
keyValue.put("workloadTestVolume",String.valueOf(test.getDevelopmentVolume()));
keyValue.put("workloadTestCorrectionFactor",String.valueOf(test.getCorrectionFactor()));
Basis deploy = workload.getDevelopment();
Basis deploy = workload.getDeploy();
keyValue.put("workloadDeployVolume",String.valueOf(deploy.getDevelopmentVolume()));
keyValue.put("workloadDeployCorrectionFactor",String.valueOf(deploy.getCorrectionFactor()));
Basis total = workload.getDevelopment();
Basis total = workload.getTotal();
keyValue.put("workloadTotalVolume",String.valueOf(total.getDevelopmentVolume()));
keyValue.put("workloadTotalCorrectionFactor",String.valueOf(total.getCorrectionFactor()));
DifficultyAssessment difficultyAssessment = assessmentReport.getDifficultyAssessment();
keyValue.put("difficultyAssessmentDes",difficultyAssessment.getDes());
FrameDifficulty frameDifficulty = difficultyAssessment.getFrameDifficulty();
keyValue.put("difficultyFrameDifficultySystemEvaluation",String.valueOf(frameDifficulty.getSystemEvaluation()));
keyValue.put("difficultyFrameDifficultyMessage",String.valueOf(frameDifficulty.getMessage()));
keyValue.put("difficultyFrameDifficultyDifficulty",String.valueOf(frameDifficulty.getDifficulty()));
keyValue.put("difficultyFrameDifficultyLoad",String.valueOf(frameDifficulty.getLoad()));
keyValue.put("difficultyFrameDifficultyDetails",Framework.getByCode(frameDifficulty.getDetails()).getName());
keyValue.put("difficultyFrameDifficultyDistributed",flipYesOrNo(frameDifficulty.getDistributed()));
keyValue.put("difficultyFrameDifficultyLoadBalance",flipYesOrNo(frameDifficulty.getLoadBalance()));
keyValue.put("difficultyFrameDifficultyDisaster",flipYesOrNo(frameDifficulty.getDisaster()));
keyValue.put("difficultyFrameDifficultyOtherDemand",frameDifficulty.getOtherDemand());
keyValue.put("difficultyDifficultySystemEvaluation",String.valueOf(frameDifficulty.getSystemEvaluation()));
keyValue.put("difficultyDifficultyMessage",String.valueOf(frameDifficulty.getMessage()));
keyValue.put("difficultyDifficultyDifficulty",String.valueOf(frameDifficulty.getDifficulty()));
keyValue.put("difficultyDifficultyLoad",String.valueOf(frameDifficulty.getLoad()));
keyValue.put("difficultyDifficultyDetails",Framework.getByCode(frameDifficulty.getDetails()).getName());
keyValue.put("difficultyDifficultyDistributed",flipYesOrNo(frameDifficulty.getDistributed()));
keyValue.put("difficultyDifficultyLoadBalance",flipYesOrNo(frameDifficulty.getLoadBalance()));
keyValue.put("difficultyDifficultyDisaster",flipYesOrNo(frameDifficulty.getDisaster()));
keyValue.put("difficultyDifficultyOtherDemand",frameDifficulty.getOtherDemand());
BrowserDifficulty browserDifficulty = difficultyAssessment.getBrowserDifficulty();
keyValue.put("browserDifficultySystemEvaluation",String.valueOf(browserDifficulty.getSystemEvaluation()));
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论