添加根据对标单元id获取日志详情接口

src/main/java/com/keymobile/indicators/api/hytobacco/DriveIndCalResultCtrl.java

+package com.keymobile.indicators.api.hytobacco;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.keymobile.indicators.model.entity.indicators.CompareUnitDef;
+import com.keymobile.indicators.service.hytobacco.CompareUnitCalLogService;
+import com.keymobile.indicators.service.hytobacco.DriveIndCalResultService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(tags={"对标单元指标计算接口"})
+@RestController
+@RequestMapping(value = "/driveIndCal")
+public class DriveIndCalResultCtrl {
+	@Autowired
+	private DriveIndCalResultService driveIndCalResultService;
+	@Autowired
+	private CompareUnitCalLogService compUnitCalLogService;
+	
+	@ApiOperation(value = "对标计算", notes = "对标计算")
+	@PostMapping(value = "/calculateComp")
+	public void calculateComp(@RequestParam String compareId,@RequestParam String compareObjsString,
+			@RequestParam String driveIndIdsString,@RequestParam int date) {
+		driveIndCalResultService.calculateComp(compareId, compareObjsString, driveIndIdsString, date);
+	}
+	
+	@ApiOperation(value = "对标单元综合计算", notes = "对标单元综合计算")
+	@PostMapping(value = "/compareUnitListCal")
+	public void compareUnitListCal(@RequestBody List<CompareUnitDef> compareUnitList) {
+		driveIndCalResultService.compareUnitListCal(compareUnitList);
+	}
+	
+	@ApiOperation(value = "根据对标单元id分页获取日志详情", notes = "根据对标单元id分页获取日志详情")
+	@PostMapping(value = "/findPageByCompareId")
+	public Map<String,Object> findPageByCompareId(@RequestParam String compareId,
+			@RequestParam(defaultValue = "0") int page,@RequestParam(defaultValue = "10") int rows){
+		return compUnitCalLogService.findPageByCompareId(compareId, page, rows);
+	}
+}

src/main/java/com/keymobile/indicators/api/hytobacco/IndicatorsDefCtrl.java

@@ -11,10 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keymobile.indicators.model.entity.indicators.BaseIndDef;
-import com.keymobile.indicators.model.entity.indicators.CompareUnitDef;
 import com.keymobile.indicators.model.entity.indicators.DriveIndDef;
 import com.keymobile.indicators.service.hytobacco.BaseIndDefService;
-import com.keymobile.indicators.service.hytobacco.DriveIndCalResultService;
 import com.keymobile.indicators.service.hytobacco.DriveIndDefService;
 
 import io.swagger.annotations.Api;
@@ -29,8 +27,6 @@ public class IndicatorsDefCtrl {
 	private BaseIndDefService baseIndDefService;
 	@Autowired
 	private DriveIndDefService driveIndDefService;
-	@Autowired
-	private DriveIndCalResultService driveIndCalResultService;
 	
 	@ApiOperation(value = "获取基础指标最大id", notes = "获取基础指标最大id")
 	@PostMapping(value = "/getBaseIndMaxId")
@@ -119,17 +115,4 @@ public class IndicatorsDefCtrl {
 			@RequestParam(defaultValue = "0") int page,@RequestParam(defaultValue = "10") int rows) throws Exception{
 		return driveIndDefService.getByPageAndKeyword(catalogId, keyword, page, rows);
 	}
-	
-	@ApiOperation(value = "对标计算", notes = "对标计算")
-	@PostMapping(value = "/calculateComp")
-	public void calculateComp(@RequestParam String compareId,@RequestParam String compareObjsString,
-			@RequestParam String driveIndIdsString,@RequestParam int date) {
-		driveIndCalResultService.calculateComp(compareId, compareObjsString, driveIndIdsString, date);
-	}
-	
-	@ApiOperation(value = "对标单元综合计算", notes = "对标单元综合计算")
-	@PostMapping(value = "/compareUnitListCal")
-	public void compareUnitListCal(@RequestBody List<CompareUnitDef> compareUnitList) {
-		driveIndCalResultService.compareUnitListCal(compareUnitList);
-	}
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/CompareUnitCalLogMapper.java

 package com.keymobile.indicators.model.mapper.indmapper;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.CompareUnitCalLog;
 
@@ -8,5 +12,7 @@ import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface CompareUnitCalLogMapper extends BaseMapper<CompareUnitCalLog>{
-
+	public List<CompareUnitCalLog> findByCompareId(Map<String,Object> param);
+	
+	public int countByCompareId(@Param("compareId") String compareId);
 }

src/main/java/com/keymobile/indicators/service/hytobacco/CompareUnitCalLogService.java

 package com.keymobile.indicators.service.hytobacco;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,4 +31,23 @@ public class CompareUnitCalLogService {
 	public CompareUnitCalLog findById(Integer id) {
 		return compareUnitCalLogMapper.selectByPrimaryKey(id);
 	}
+	
+	//分页根据对标单元id获取对应运行日志
+	public Map<String,Object> findPageByCompareId(String compareId,int page,int rows){
+		Map<String,Object> paramMap = new HashMap<>();
+		Map<String,Object> resultMap = new HashMap<>();
+		//计算总数
+		int count = compareUnitCalLogMapper.countByCompareId(compareId);
+		//计算start
+		int start = page*rows;
+		paramMap.put("compareId", compareId);
+		paramMap.put("start", start);
+		paramMap.put("end", rows);
+		List<CompareUnitCalLog> datas = compareUnitCalLogMapper.findByCompareId(paramMap);
+		
+		resultMap.put("resultList", datas);
+		resultMap.put("total", count);
+		
+		return resultMap;
+	}
 }

src/main/resources/mybatis/mapping/CompareUnitCalLogMapper.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.keymobile.indicators.model.mapper.indmapper.CompareUnitCalLogMapper">
-
+	<select id="findByCompareId" parameterType="map" resultType="com.keymobile.indicators.model.entity.indicators.CompareUnitCalLog" >
+        select * 
+        from compare_unit_cal_log 
+        where compare_id=#{compareId} 
+        limit #{start},#{end} 
+        order by create_time desc
+    </select>
+    
+    <select id="countByCompareId" parameterType="java.lang.String" resultType="java.lang.Integer">
+    	select count(1) 
+        from compare_unit_cal_log 
+        where compare_id=#{compareId}
+    </select>
 </mapper>
\ No newline at end of file