Skip to content

A
amos-boot-biz
Commit 170b2f70 authored by xixinzhao's avatar xixinzhao
Browse files
Options

三维校验接口

parent f5dcfac9
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 11 deletions
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/CheckResultMapper.java
View file @ 170b2f70
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.util.List;
......@@ -29,4 +30,7 @@ public interface CheckResultMapper extends BaseMapper<CheckResult> {
List<CheckResultDto> getOne(String amosOrgCode);
List<CheckResult> getCheckItemNo(@Param("modelName") String modelName);
Map<String, Object> selectCheckItemTotal(@Param("modelName") String modelName);
}
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/ModelItemMapper.java
View file @ 170b2f70
......@@ -2,11 +2,15 @@ package com.yeejoin.amos.boot.module.tdc.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.util.List;
/**
* @author DELL
*/
@Mapper
public interface ModelItemMapper extends BaseMapper<ModelItem> {
List<ModelItem> getListByName(@Param("modelName") String modelName, @Param("orgCode") String orgCode);
}
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckReportService.java
View file @ 170b2f70
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tdc.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.stereotype.Service;
import java.util.Map;
......@@ -16,4 +17,5 @@ public interface CheckReportService extends IService<CheckReport> {
Map getInfo(int pageNumber,int pageSize);
void createReport(String batchNo, AgencyUserModel userInfo);
}
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckResultService.java
View file @ 170b2f70
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
import com.yeejoin.amos.boot.module.tdc.api.dto.DimensionTableDto;
import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.stereotype.Service;
import java.util.List;
......@@ -58,4 +59,9 @@ public interface CheckResultService extends IService<CheckResult> {
List<DimensionTableDto> getDimensionTable(String id);
List<ModelTreeDto> getModelTreeData(String modelName, AgencyUserModel userInfo);
List<CheckResult> getCheckItem(String modelName, AgencyUserModel userInfo);
Map<String, Object> selectCheckItemTotal(String modelName, AgencyUserModel userInfo);
}
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/ModelItemService.java
View file @ 170b2f70
package com.yeejoin.amos.boot.module.tdc.api.service;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
......
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckResultMapper.xml
View file @ 170b2f70
......@@ -36,4 +36,47 @@
select amos_org_name,amos_org_code,batch_no,model_id from tdc_check_result where amos_org_code = #{amosOrgCode} group by model_name ORDER BY check_date desc limit 0,1;
</select>
<select id="getCheckItemNo" resultType="com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult">
SELECT
*
FROM
tdc_check_result
WHERE
batch_no = (
SELECT
batch_no
FROM
tdc_submit_record
ORDER BY
submit_time DESC
LIMIT 1
)
AND check_item_result = 1
<if test="modelName != null and modelName != '' and modelName != '-1'">
AND model_name = #{modelName}
</if>
</select>
<select id="selectCheckItemTotal" resultType="java.util.Map">
SELECT
count(1) AS total, COUNT(CASE WHEN (check_item_result=1) THEN check_item_result END) AS unqualified, batch_no AS batchNo
FROM
tdc_check_result
WHERE
batch_no = (
SELECT
batch_no
FROM
tdc_submit_record
-- WHERE
-- amos_org_code = '50*110'
ORDER BY
submit_time DESC
LIMIT 1
)
<if test="modelName != null and modelName != '' and modelName != '-1'">
AND model_name = #{modelName}
</if>
</select>
</mapper>
\ No newline at end of file
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/ModelItemMapper.xml
View file @ 170b2f70
<?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.yeejoin.amos.boot.module.tdc.api.mapper.ModelItemMapper">
<select id="getListByName" resultType="com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem">
SELECT
sequence_nbr, check_item_label, check_item_value, model_name, submit_record_id
FROM
tdc_model_item
WHERE
submit_record_id = (
SELECT
sequence_nbr
FROM
tdc_submit_record
WHERE
amos_org_code = #{orgCode}
ORDER BY
submit_time DESC
LIMIT 1
)
<if test="modelName != null and modelName != '' and modelName != '-1'">
AND model_name = #{modelName}
</if>
</select>
</mapper>
\ No newline at end of file
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/action/CheckModelAction.java
View file @ 170b2f70
......@@ -93,6 +93,7 @@ public class CheckModelAction {
checkResult.setCheckItemResult(result);
checkResult.setCheckExplain(checkExplain);
checkResult.setCheckItem(checkItem);
checkResult.setCheckItemLabel(checkItem);
checkResult.setCheckItemValue(checkItemValue);
checkResult.setModelId(String.valueOf(checkModel.getSequenceNbr()));
checkResult.setAmosOrgCode(checkModel.getAmosOrgCode());
......
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckReportController.java
View file @ 170b2f70
package com.yeejoin.amos.boot.module.tdc.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
import com.yeejoin.amos.boot.module.tdc.biz.service.impl.CheckReportImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
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 org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
......@@ -24,7 +27,7 @@ import java.util.Map;
@RestController
@Api(tags = "校验报告api")
@RequestMapping(value = "/report")
public class CheckReportController {
public class CheckReportController extends BaseController {
@Autowired
CheckReportService checkReportService;
......@@ -41,7 +44,6 @@ public class CheckReportController {
return ResponseHelper.buildResponse(checkReportService.selectAll(current,size,amosOrgCode));
}
/**
*
* return
......@@ -53,4 +55,13 @@ public class CheckReportController {
return ResponseHelper.buildResponse(checkReportService.getInfo(pageNumber,pageSize));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "createReport")
@ApiOperation(httpMethod = "GET",value = "创建报告", notes = "创建报告")
public ResponseModel createReport(String batchNo) {
AgencyUserModel userInfo = getUserInfo();
checkReportService.createReport(batchNo, userInfo);
return ResponseHelper.buildResponse(true);
}
}
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckResultController.java
View file @ 170b2f70
......@@ -11,10 +11,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -118,5 +115,27 @@ public class CheckResultController extends BaseController {
return ResponseHelper.buildResponse(checkResultService.getDimensionTable(id));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/getModelTreeData")
@ApiOperation(httpMethod = "GET",value = "获取单独模型树", notes = "根据模型id获取模型树")
public ResponseModel<List<ModelTreeDto>> getModelTreeData(@RequestParam(required = false) String modelName) {
AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(checkResultService.getModelTreeData(modelName, userInfo));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/getCheckItemNo")
@ApiOperation(httpMethod = "GET",value = "获取不合格校验项", notes = "获取不合格校验项")
public ResponseModel<List<CheckResult>> getCheckItem(@RequestParam(required = false) String modelName) {
AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(checkResultService.getCheckItem(modelName, userInfo));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/selectCheckItemTotal")
@ApiOperation(httpMethod = "GET", value = "获取校验项统计", notes = "获取校验项统计")
public ResponseModel<Map<String, Object>> selectCheckItemTotal(@RequestParam(required = false) String modelName) {
AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(checkResultService.selectCheckItemTotal(modelName, userInfo));
}
}
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckReportImpl.java
View file @ 170b2f70
......@@ -7,17 +7,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
import com.yeejoin.amos.boot.module.tdc.api.enums.ReportStateEnum;
import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper;
import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import springfox.documentation.spring.web.json.Json;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -29,6 +36,9 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
@Autowired
IdxFeignService idxFeignService;
@Autowired
CheckResultService checkResultService;
@Override
public IPage<CheckReport> selectAll(int current,int size,String amosOrgCode) {
Page<CheckReport> page = new Page<>(current,size);
......@@ -78,4 +88,14 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
}
@Override
public void createReport(String batchNo, AgencyUserModel userInfo) {
List<CompanyModel> companyList = userInfo.getCompanys();
if (!CollectionUtils.isEmpty(companyList)) {
String orgCode = companyList.get(0).getOrgCode();
String realName = userInfo.getRealName();
checkResultService.saveSql(orgCode, realName, batchNo);
}
}
}
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java
View file @ 170b2f70
......@@ -15,15 +15,13 @@ import com.stoyanr.evictor.queue.NavigableMapEvictionQueue;
import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
import com.yeejoin.amos.boot.module.tdc.api.dto.DimensionTableDto;
import com.yeejoin.amos.boot.module.tdc.api.dto.ModelTreeDto;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
import com.yeejoin.amos.boot.module.tdc.api.entity.PowerReportFile;
import com.yeejoin.amos.boot.module.tdc.api.entity.*;
import com.yeejoin.amos.boot.module.tdc.api.enums.WordPowerTypeEum;
import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckModelMapper;
import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper;
import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper;
import com.yeejoin.amos.boot.module.tdc.api.mapper.ModelItemMapper;
import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
import com.yeejoin.amos.boot.module.tdc.api.utils.WordPowerUtils;
......@@ -31,11 +29,13 @@ import com.yeejoin.amos.boot.module.tdc.api.vo.SubjectTreeVo;
import com.yeejoin.amos.boot.module.tdc.api.vo.TableColumnsVo;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import liquibase.pro.packaged.M;
import org.codehaus.jettison.json.JSONString;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -65,6 +65,8 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
@Autowired
CheckModelMapper checkModelMapper;
@Autowired
ModelItemMapper modelItemMapper;
@Override
public IPage<CheckResultDto> selectResult(int current,int size,String code) {
......@@ -345,6 +347,50 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
}
}
@Override
public List<ModelTreeDto> getModelTreeData(String modelName, AgencyUserModel user) {
List<CompanyModel> companyList = user.getCompanys();
List<ModelTreeDto> list = new ArrayList<>();
if (!CollectionUtils.isEmpty(companyList)) {
String companyName = companyList.get(0).getCompanyName();
String orgCode = companyList.get(0).getOrgCode();
List<ModelItem> listByName = modelItemMapper.getListByName(modelName, orgCode);
if (!CollectionUtils.isEmpty(listByName)) {
Map<String, List<ModelItem>> collect = listByName.stream().collect(Collectors.groupingBy(ModelItem::getModelName));
collect.forEach((key, value) -> {
ModelTreeDto modelTreeDto = new ModelTreeDto();
modelTreeDto.setAmosOrgName(companyName);
modelTreeDto.setName(key);
modelTreeDto.setId(key);
List<Map<String, Object>> valueList = value.stream().map(e -> {
Map<String, Object> map = new HashMap<>(3);
map.put("data", e.getCheckItemValue());
map.put("id", e.getSequenceNbr());
map.put("name", e.getCheckItemLabel());
return map;
}).collect(Collectors.toList());
modelTreeDto.setChildren(valueList);
list.add(modelTreeDto);
});
}
}
return list;
}
@Override
public List<CheckResult> getCheckItem(String modelName, AgencyUserModel userInfo) {
// List<CompanyModel> companyList = userInfo.getCompanys();
// List<CheckResult> resultList = new ArrayList<>();
// if (!CollectionUtils.isEmpty(companyList)) {
// String orgCode = companyList.get(0).getOrgCode();
// resultList = checkResultMapper.getCheckItemNo(modelName, orgCode);
// }
return checkResultMapper.getCheckItemNo(modelName);
}
@Override
public Map<String, Object> selectCheckItemTotal(String modelName, AgencyUserModel userInfo) {
return checkResultMapper.selectCheckItemTotal(modelName);
}
}
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/ModelItemServiceImpl.java
View file @ 170b2f70
......@@ -43,6 +43,9 @@ public class ModelItemServiceImpl extends ServiceImpl<ModelItemMapper, ModelItem
@Autowired
SubmitRecordMapper submitRecordMapper;
@Autowired
ModelItemMapper modelItemMapper;
@Override
public void saveModelItem(JSONObject jsonObject, AgencyUserModel userInfo) {
long start = System.currentTimeMillis();
......@@ -160,5 +163,4 @@ public class ModelItemServiceImpl extends ServiceImpl<ModelItemMapper, ModelItem
checkResultMapper.delete(resultWrapper);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment