新增接口查询阀厅指标接口

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/feign/IdxFeignService.java

@@ -22,7 +22,7 @@ public interface IdxFeignService {
      * @param tableId
      * @return
      */
-    @RequestMapping(value = "/table/{tableId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/v1/table/{tableId}", method = RequestMethod.GET)
     ResponseModel<JSONObject> queryByTableId(@PathVariable String tableId);
 
     /**

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/mapper/CheckResultMapper.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
 import org.mapstruct.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 检验结果的Mapper层
@@ -17,4 +18,7 @@ public interface CheckResultMapper extends BaseMapper<CheckResult> {
 
     List<CheckResultDto> selectTotal(String modelId, String amosOrgCode);
 
+    Map getTable(String tableName);
+
+
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckResultService.java

@@ -20,4 +20,10 @@ public interface CheckResultService extends IService<CheckResult> {
     List<CheckResultDto> selectTotal(String modelId, String amosOrgCode);
 
     List<ModelTreeDto> test();
+
+    ModelTreeDto treeTwo(String tableId);
+
+
+
+
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckResultMapper.xml

@@ -10,4 +10,10 @@
         SELECT count(1) as total, COUNT(CASE WHEN (check_item_result=1) THEN check_item_result END) AS aaa
         FROM tdc_check_result WHERE model_id = #{modelId} and amos_org_code = #{amosOrgCode}
     </select>
+
+
+    <select id="getTable" resultType="Map" >
+        SELECT a.* FROM ${tableName} AS a ORDER BY a.date DESC LIMIT 1
+    </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/controller/CheckResultController.java

@@ -73,4 +73,14 @@ public class CheckResultController extends BaseController {
         return ResponseHelper.buildResponse(checkResultService.test());
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/selectCheckResult/TreeTwo")
+    @ApiOperation(httpMethod = "GET",value = "查询最后一次校验模型",  notes = "查询最后一次校验模型")
+    public ResponseModel<ModelTreeDto> treeTwo(String tableId) {
+
+        return ResponseHelper.buildResponse(checkResultService.treeTwo(tableId));
+    }
+
+
 }

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
 import com.yeejoin.amos.boot.module.tdc.api.vo.SubjectTreeVo;
 import com.yeejoin.amos.boot.module.tdc.api.vo.TableColumnsVo;
+import org.codehaus.jettison.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -54,6 +55,7 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
         return checkResultMapper.selectTotal(modelId, amosOrgCode);
     }
 
+
     @Override
     public List<ModelTreeDto> test() {
         ResponseModel<List<JSONObject>> listResponseModel = idxFeignService.subjectTree("d2528788-b8d5-4170-ae62-edf153fddc59");
@@ -64,29 +66,46 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
             tables.forEach(table -> {
                 ModelTreeDto modelTreeDto = new ModelTreeDto();
                 SubjectTreeVo subjectTreeVo = JSON.parseObject(JSON.toJSONString(table), SubjectTreeVo.class);
-                selct(modelTreeDto, subjectTreeVo);
+                select(modelTreeDto, subjectTreeVo);
                 modelTreeDtoList.add(modelTreeDto);
             });
-
         });
         return modelTreeDtoList;
     }
 
-    private void selct(ModelTreeDto modelTreeDto, SubjectTreeVo subjectTreeVo) {
+    private void select(ModelTreeDto modelTreeDto, SubjectTreeVo subjectTreeVo) {
         modelTreeDto.setId(subjectTreeVo.getTableId());
         modelTreeDto.setName(subjectTreeVo.getTopicName());
         modelTreeDto.setTableName(subjectTreeVo.getTableName());
         List<TableColumnsVo> columns = subjectTreeVo.getColumns();
-
+        Map tableMap = checkResultMapper.getTable(subjectTreeVo.getTableName());
         List<Map<String, Object>> list = new ArrayList<>();
         columns.forEach(tableColumnsVo -> {
             Map<String, Object> map = new HashMap<>(3);
             map.put("name", tableColumnsVo.getName());
             map.put("id", tableColumnsVo.getId());
-            map.put("data", 1);
+            map.put("data", tableMap.get(tableColumnsVo.getColumnName()));
             list.add(map);
         });
         modelTreeDto.setChildren(list);
     }
 
+    @Override
+    public ModelTreeDto treeTwo(String tableId) {
+
+        ResponseModel<JSONObject> listResponseModel = idxFeignService.queryByTableId(tableId);
+        JSONObject result = listResponseModel.getResult();
+        ModelTreeDto modelTreeDto = new ModelTreeDto();
+        SubjectTreeVo subjectTreeVo = JSON.parseObject(JSON.toJSONString(result), SubjectTreeVo.class);
+
+//        List<TableColumnsVo> list = result.getJSONArray("tableCols").toJavaList(TableColumnsVo.class);
+//        subjectTreeVo.setColumns(list);
+        select(modelTreeDto, subjectTreeVo);
+        return modelTreeDto;
+
+    }
+
+
+
+
 }

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/resources/application.properties

-spring.application.name=TDC-FHZ
+spring.application.name=TDC-LM
 server.servlet.context-path=/tdc
 server.port=13000