Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/dto/CheckResultDto.java

+package com.yeejoin.amos.boot.module.tdc.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("tdc_check_result")
+public class CheckResultDto {
+
+    @ApiModelProperty(value="校验时间")
+    private Date checkDate;
+
+    @ApiModelProperty(value="模型名称")
+    private String name;
+
+
+}

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/entity/CheckResult.java

+package com.yeejoin.amos.boot.module.tdc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true )
+@Accessors(chain = true)
+@TableName("tdc_check_result")
+public class CheckResult extends BaseEntity {
+
+    @ApiModelProperty(value="校验时间")
+    private Date checkDate;
+
+    @ApiModelProperty(value="模型名称")
+    private String modelName;
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.tdc.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
+import org.mapstruct.Mapper;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 检验结果的Mapper层
+ */
+@Mapper
+public interface CheckResultMapper extends BaseMapper<CheckResult> {
+
+    List<CheckResultDto> selectResult(String code);
+
+}

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

+package com.yeejoin.amos.boot.module.tdc.api.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public interface CheckResultService extends IService<CheckResult> {
+
+
+    List<CheckResultDto> selectResult(String code);
+}

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

+<?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.CheckResultMapper">
+    <select id="selectResult" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto">
+        select check_date, case when check_type="1" then  '全站校验' else `model_name` end as `name`
+        from `tdc_check_result` where amos_org_code=#{code} GROUP BY batch_no;
+    </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

 package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
+import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
 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.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
 
 
 /**
@@ -19,15 +29,16 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 @RequestMapping(value = "/check-result")
 public class CheckResultController extends BaseController {
 
-
+    @Autowired
+    CheckResultService checkResultService;
 
     /**
      * cs
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/test")
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/selectResult/{code}")
     @ApiOperation(httpMethod = "GET", value = "测试", notes = "测试")
-    public String test() {
-        return "aaaaa";
+    public ResponseModel<List<CheckResultDto>> selectResult(@PathVariable(value = "code") String code) {
+        return ResponseHelper.buildResponse(checkResultService.selectResult(code));
     }
 }

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

+package com.yeejoin.amos.boot.module.tdc.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
+import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper;
+import com.yeejoin.amos.boot.module.tdc.api.service.CheckResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.xml.transform.Result;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements CheckResultService {
+
+    @Autowired
+    CheckResultMapper checkResultMapper;
+
+
+    @Override
+    public List<CheckResultDto> selectResult(String code) {
+        return checkResultMapper.selectResult(code);
+    }
+}