增加数据运算里的试运算、计算、短板里的运算日志

src/main/java/com/keymobile/indicators/akka/actor/indicators/BeforeCompareUnitCalActor.java

@@ -60,6 +60,8 @@ public class BeforeCompareUnitCalActor extends AbstractActor{
 					StartCompareUnitCalMsg startCompareUnitCalMsg = new StartCompareUnitCalMsg(
 							compareUnitDefs,beforeCompareUnitCalMsg.getCode(),
 							beforeCompareUnitCalMsg.getIsTest());
+					//加入点击运算的用户
+					startCompareUnitCalMsg.setUser(beforeCompareUnitCalMsg.getUser());
 					ActorRef startCompareUnitCalActor = this.getContext().actorOf(Props.create(
 							StartCompareUnitCalActor.class,()-> new StartCompareUnitCalActor(getSelf())));
 					startCompareUnitCalActor.tell(startCompareUnitCalMsg, getSelf());

src/main/java/com/keymobile/indicators/akka/actor/indicators/CompareUnitCalActor.java

@@ -78,6 +78,10 @@ public class CompareUnitCalActor extends AbstractActor{
 					//新增运行日志记录
 					CompareUnitCalLog compCalLog = new CompareUnitCalLog(compareId,date,
 							System.currentTimeMillis()+"","0");
+					compCalLog.setCreater(compareUnitCalMsg.getUser());
+					//1成功
+					compCalLog.setStatus(1);
+					compCalLog.setType(isTest);
 					//保存
 					Integer compCalLogId = compareUnitCalLogService.saveOrUndate(compCalLog);
 					

src/main/java/com/keymobile/indicators/akka/actor/indicators/DriveIndIdObjCalActor.java

@@ -149,6 +149,7 @@ public class DriveIndIdObjCalActor extends AbstractActor{
 					}
 					if(baseIndValueMsg.getIsFinish()==0) {
 						//日志填充
+						compCalLog.setStatus(0);
 						if(compCalLog!=null) {
 							String logInfo = compCalLog.getLogInfo();
 							if(StringUtils.isNotBlank(logInfo)) {
@@ -179,6 +180,8 @@ public class DriveIndIdObjCalActor extends AbstractActor{
 						"formula:"+driveIndFormula+";"+
 						"errorValue:"+indValue+";"+"paramEnv:"+env);
 						//日志记录
+						//运算失败
+						compCalLog.setStatus(0);
 						String logInfo = compCalLog.getLogInfo();
 						if(StringUtils.isNotBlank(logInfo)) {
 							logInfo+="替换公式值出错：driveIndId:"+driveIndId+";"+
@@ -279,6 +282,7 @@ public class DriveIndIdObjCalActor extends AbstractActor{
 									compCalLog.setLogInfo("计算考核指标出错：driveIndId:"+driveIndId+";"+
 											"paramEnv:"+env+";formula:"+driveIndFormula+"</n>");
 								}
+								compCalLog.setStatus(0);
 								//保存日志
 								if(compCalLog!=null) {
 									compareUnitCalLogService.saveOrUndate(compCalLog);
@@ -292,6 +296,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{
 							}
 						}else {
 							//返回考核指标因为考核指标公式中的数据项不存在而导致的计算错误标识
+                            //保存日志
+							if(compCalLog!=null) {
+								compareUnitCalLogService.saveOrUndate(compCalLog);
+							}
 							CalIndAverageAndRankMsg driveIndAverageAndRankMsg = 
 									new CalIndAverageAndRankMsg(-1,
 											compareId,driveIndId,compareObj,date,"NaN",

src/main/java/com/keymobile/indicators/akka/actor/indicators/StartCompareUnitCalActor.java

@@ -63,6 +63,7 @@ public class StartCompareUnitCalActor extends AbstractActor{
 				.match(StartCompareUnitCalMsg.class,startCompareUnitCalMsg -> {
 					code = startCompareUnitCalMsg.getCode();
 					isTest = startCompareUnitCalMsg.getIsTest();
+					String user = startCompareUnitCalMsg.getUser();
 					List<CompareUnitDef> compareUnitDefs = startCompareUnitCalMsg.getCompareInitDefs();
 					//将对标单元进行分类，需要先执行的先开始进行对标计算
 					for(CompareUnitDef unitDef : compareUnitDefs) {
@@ -88,6 +89,9 @@ public class StartCompareUnitCalActor extends AbstractActor{
 							CompareUnitCalMsg compareUnitCalMsg = new CompareUnitCalMsg(unitDef,
 									startCompareUnitCalMsg.getCode(),
 									startCompareUnitCalMsg.getIsTest());
+							//运算者
+							compareUnitCalMsg.setUser(user);
+
 							ActorRef compareUnitCalActor = this.getContext()
 									.actorOf(Props.create(CompareUnitCalActor.class,
 											()->new CompareUnitCalActor(getSelf())));

src/main/java/com/keymobile/indicators/akka/message/indicators/CompareUnitCalMsg.java

@@ -16,12 +16,22 @@ public class CompareUnitCalMsg implements Serializable{
 	
 	private String isTest;
 
+	private String user;
+
 	public CompareUnitCalMsg(CompareUnitDef compareUnitDef,String code,String isTest) {
 		this.compareUnitDef = compareUnitDef;
 		this.code = code;
 		this.isTest = isTest;
 	}
 
+	public String getUser() {
+		return user;
+	}
+
+	public void setUser(String user) {
+		this.user = user;
+	}
+
 	public CompareUnitDef getCompareUnitDef() {
 		return compareUnitDef;
 	}

src/main/java/com/keymobile/indicators/akka/message/indicators/StartCompareUnitCalMsg.java

@@ -18,12 +18,22 @@ public class StartCompareUnitCalMsg implements Serializable{
 	
 	private String isTest;
 
+	private String user;
+
 	public StartCompareUnitCalMsg(List<CompareUnitDef> compareInitDefs,String code,String isTest) {
 		this.compareInitDefs.addAll(compareInitDefs);
 		this.code = code;
 		this.setIsTest(isTest);
 	}
 
+	public String getUser() {
+		return user;
+	}
+
+	public void setUser(String user) {
+		this.user = user;
+	}
+
 	public List<CompareUnitDef> getCompareInitDefs() {
 		return compareInitDefs;
 	}

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

 package com.keymobile.indicators.api.hytobacco;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.keymobile.indicators.model.entity.indicators.CompareUnitCalLog;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -86,4 +93,7 @@ public class DriveIndCalResultCtrl {
 			@RequestParam String code) {
 		driveIndCalResultService.deleteCompareUnitData(compareIds, currentDate, sameDate, code);
 	}
+
+
+
 }

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

 package com.keymobile.indicators.api.hytobacco;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.keymobile.indicators.model.entity.shortboard.ShortBoardWarnData;
+import com.keymobile.indicators.model.entity.shortboard.*;
+import com.keymobile.indicators.service.hytobacco.ShortComparedLogService;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,9 +22,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keymobile.indicators.constant.Constants;
-import com.keymobile.indicators.model.entity.shortboard.ShortboardRecord;
-import com.keymobile.indicators.model.entity.shortboard.ShortboardUnit;
-import com.keymobile.indicators.model.entity.shortboard.ShortboardUnitCatalog;
 import com.keymobile.indicators.service.hytobacco.ShortboardRuleService;
 import com.keymobile.indicators.service.hytobacco.ShortboardUnitCatalogService;
 import com.keymobile.indicators.service.hytobacco.ShortboardUnitService;
@@ -37,6 +40,8 @@ public class ShortboardUnitCtrl {
 	private ShortboardUnitService shortboardUnitService;
 	@Autowired
 	private ShortboardRuleService shortboardRuleService;
+	@Autowired
+	private ShortComparedLogService shortComparedLogService;
 
 	@ApiOperation(value = "新增/修改短板筛选单元目录", notes = "新增/修改短板筛选单元目录")
 	@PostMapping(value = "/saveOrUpdateCatalog")
@@ -159,4 +164,23 @@ public class ShortboardUnitCtrl {
 			@RequestParam(defaultValue = "0") int page,@RequestParam(defaultValue = "10") int rows)throws Exception{
 		return shortboardUnitService.getShortboardRecordPage(codes, page, rows);
 	}
+
+	@ApiOperation(value = "分页获取短板单元日志", notes = "分页获取短板单元日志")
+	@PostMapping(value = "/findComparedLogPage")
+	public Page<ShortComparedLog> findComparedLogPage(@ApiParam("短板运算单元id") @RequestParam(value = "shortUnitId") Integer shortUnitId,
+													  @ApiParam("页码，从1开始") @RequestParam("pageNo") int page,
+													  @ApiParam("每页条数") @RequestParam("pageSize") int pageSize){
+		PageRequest request = PageRequest.of(page-1,pageSize);
+		Map<String,Object> params = new HashMap<>();
+		params.put("page",request.getOffset());
+		params.put("pageSize",pageSize);
+		params.put("shortUnitId",shortUnitId);
+		long count =shortComparedLogService.selectComparedLogCountByParams(params);
+		List<ShortComparedLog> shortComparedLogs = new ArrayList<>();
+		if(count>0){
+		shortComparedLogs=shortComparedLogService.findComparedLogPageByParams(params);
+		}
+		return new PageImpl<>(shortComparedLogs,request,count);
+	}
+
 }

src/main/java/com/keymobile/indicators/model/entity/indicators/CompareUnitCalLog.java

@@ -29,7 +29,8 @@ public class CompareUnitCalLog {
 	private String startTime;
 	private String endTime;
 	private String runStatus;//0:运行中     1：运行完成
-	
+	private Integer status;//1成功0失败
+	private String  type;//0试运行 1运行
 	public CompareUnitCalLog(String compareId,Integer date,String startTime,String runStatus) {
 		this.compareId = compareId;
 		this.date = date;

src/main/java/com/keymobile/indicators/model/entity/shortboard/ShortComparedLog.java

+package com.keymobile.indicators.model.entity.shortboard;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import java.util.Date;
+
+/**
+ * @Description  
+ * @Author  Hunter
+ * @Date 2020-10-22 
+ */
+
+@Data
+@Table ( name ="short_compared_log" )
+@ApiModel("短板运算日志")
+public class ShortComparedLog  implements Serializable {
+
+	private static final long serialVersionUID =  4162200769912762515L;
+
+	@Id
+   	@Column(name = "id" )
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	/**
+	 * 运算短板单元id
+	 */
+	@ApiModelProperty("运算短板单元id")
+   	@Column(name = "short_unit_id" )
+	private Integer shortUnitId;
+
+	/**
+	 * 短板单元name
+	 */
+	@ApiModelProperty("短板单元name")
+   	@Column(name = "short_unit_name" )
+	private String shortUnitName;
+
+	/**
+	 * 日记信息
+	 */
+	@ApiModelProperty("日记信息")
+   	@Column(name = "loginfo" )
+	private String loginfo;
+
+	/**
+	 * 1成功0失败 2 运行中
+	 */
+	@ApiModelProperty("0失败 1成功 2 运行中")
+   	@Column(name = "status" )
+	private Integer status;
+
+	/**
+	 * 筛选出多少条预警池数据
+	 */
+	@ApiModelProperty("筛选出多少条预警池数据")
+   	@Column(name = "value" )
+	private Integer value;
+
+	/**
+	 * 创造者
+	 */
+	@ApiModelProperty("创造者")
+   	@Column(name = "creat_user" )
+	private String creatUser;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty("创建时间")
+   	@Column(name = "creat_time" )
+	private Date creatTime;
+
+}

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

+package com.keymobile.indicators.model.mapper.indmapper;
+
+import com.keymobile.indicators.model.entity.shortboard.ShortComparedLog;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ShortComparedLogMapper  extends BaseMapper<ShortComparedLog> {
+    long selectComparedLogCountByParams(Map<String, Object> params);
+
+    List<ShortComparedLog> findComparedLogPageByParams(Map<String, Object> params);
+}

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

@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.keymobile.indicators.model.entity.indicators.CompareUnitCalLog;
+import com.keymobile.indicators.utils.SystemUserUtil;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -110,6 +112,9 @@ public class DriveIndCalResultService {
 			final ActorSystem system = ActorSystem.create("CompareUnitCalAkka");//创建akka
 			StartCompareUnitCalMsg startCompareUnitCalMsg = new StartCompareUnitCalMsg(
 					sameCompareUnitList,code,isTest);
+
+			startCompareUnitCalMsg.setUser(SystemUserUtil.getCurrentUser());
+
 			ActorRef beforeCompareUnitCalActor = system.actorOf(Props.create(
 					BeforeCompareUnitCalActor.class,()-> new BeforeCompareUnitCalActor()));
 			beforeCompareUnitCalActor.tell(startCompareUnitCalMsg, ActorRef.noSender());
@@ -144,4 +149,5 @@ public class DriveIndCalResultService {
 			objScoreCalResultMapper.deleteByCompareIdInAndDateIn(param2);
 		}
 	}
+
 }

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

+package com.keymobile.indicators.service.hytobacco;
+
+import com.keymobile.indicators.model.entity.shortboard.ShortComparedLog;
+import com.keymobile.indicators.model.mapper.indmapper.ShortComparedLogMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ShortComparedLogService {
+
+    @Autowired
+    private ShortComparedLogMapper shortComparedLogMapper;
+
+    public long selectComparedLogCountByParams(Map<String, Object> params) {
+       return  shortComparedLogMapper.selectComparedLogCountByParams(params);
+    }
+
+    public List<ShortComparedLog> findComparedLogPageByParams(Map<String, Object> params) {
+        return  shortComparedLogMapper.findComparedLogPageByParams(params);
+    }
+}

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

 package com.keymobile.indicators.service.hytobacco;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -9,6 +11,8 @@ import java.util.Map;
 
 import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.shortboard.ShortBoardWarnData;
+import com.keymobile.indicators.model.entity.shortboard.ShortComparedLog;
+import com.keymobile.indicators.model.mapper.indmapper.ShortComparedLogMapper;
 import com.keymobile.indicators.utils.LogManager;
 import com.keymobile.indicators.utils.SystemUserUtil;
 import org.apache.commons.lang.StringUtils;
@@ -35,6 +39,9 @@ public class ShortboardUnitService {
 	@Autowired
 	private ShortboardRecordMapper shortboardRecordMapper;
 
+	@Autowired
+	private ShortComparedLogMapper shortComparedLogMapper;
+
 	public Integer saveOrUpdate(ShortboardUnit shortboardUnit,String code,Integer catalogId,
 								String catalogIdPath,String user) {
 		shortboardUnit.setCode(code);
@@ -91,34 +98,23 @@ public class ShortboardUnitService {
 	@Async
 	public void getShortboardObjFromUnit(ShortBoardWarnData shortBoardWarnData) throws Exception{
 
+		ShortComparedLog shortComparedLog = new ShortComparedLog();
+		shortComparedLog.setCreatUser(shortBoardWarnData.getUser());
+		shortComparedLog.setCreatTime(new Date());
+		shortComparedLog.setShortUnitId(shortBoardWarnData.getId());
+		shortComparedLog.setStatus(2);
+		shortComparedLogMapper.insert(shortComparedLog);
+
 		LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_UNIT_API,"短板运算id={}，开始运算StartTime={}",shortBoardWarnData.getId(),new Date());
 
 		List<ShortboardRecord> result = new ArrayList<>();
 		//ShortboardUnit shortboardUnit = this.getById(id);//根据短板单元id获取短板单元
-		if(shortBoardWarnData!=null) {
+		try {
+
 			List<String> compareObjList = shortBoardWarnData.getCompareObjs();//new ArrayList<>();
 			List<String> driveIndIdList =shortBoardWarnData.getDriveIndIds();// new ArrayList<>();
 			List<Integer> shortboardIdList = shortBoardWarnData.getShortboardIds();// new ArrayList<>();
-			//转换短板对象
-//			String compareObjsString = shortBoardWarnData.getCommpareObjs();
-//			if(StringUtils.isNotBlank(compareObjsString)) {
-//				String[] compareObjs = compareObjsString.split(";");
-//				compareObjList = Arrays.asList(compareObjs);
-//			}
-			//转换考核指标id
-//			String driveIndIdsString = shortBoardWarnData.getDriveIndIds();
-//			if(StringUtils.isNotBlank(driveIndIdsString)) {
-//				String[] driveIndIds = driveIndIdsString.split(";");
-//				driveIndIdList = Arrays.asList(driveIndIds);
-//			}
-			//转换短板规则id
-//			String shortboardIdsString = shortBoardWarnData.getShortboardIds();
-//			if(StringUtils.isNotBlank(shortboardIdsString)) {
-//				String[] shortboardIds = shortboardIdsString.split(";");
-//				for(String shortboardId : shortboardIds) {
-//					shortboardIdList.add(Integer.parseInt(shortboardId));
-//				}
-//			}
+
 			if(!compareObjList.isEmpty() && !driveIndIdList.isEmpty() && !shortboardIdList.isEmpty()) {
 				result = shortboardRuleService.getObjFromShortboardRule(shortBoardWarnData);
 			}
@@ -133,9 +129,29 @@ public class ShortboardUnitService {
 				shortboardRecordMapper.batchSave(result);
 
 			}
+			LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_UNIT_API,"短板运算id={}，结束运算endTime={}，产生预警数据:{}条",shortBoardWarnData.getId(),new Date(),result.size());
+			shortComparedLog.setStatus(1);
+			shortComparedLog.setValue(result.size());
+
+		}catch (Exception e){
+			String message = "";
+			if(e!=null){
+
+				StringWriter sw = new StringWriter();
+				PrintWriter pw = new PrintWriter(sw);
+				e.printStackTrace(pw);
+				message=sw.toString();
+			}
+			if(message.length()>2000){
+				message = message.substring(0,2000);
+			}
+			shortComparedLog.setStatus(0);
+			shortComparedLog.setLoginfo(message);
+			shortComparedLog.setValue(0);
 		}
 
-		LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_UNIT_API,"短板运算id={}，结束运算endTime={}，产生预警数据:{}条",shortBoardWarnData.getId(),new Date(),result.size());
+		shortComparedLogMapper.updateByPrimaryKeySelective(shortComparedLog);
+
 		return ;
 	}
 

src/main/resources/mybatis/mapping/ShortCompareLogMapper.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.ShortComparedLogMapper">
+
+    <select id="findComparedLogPageByParams" resultType="com.keymobile.indicators.model.entity.shortboard.ShortComparedLog">
+        select *
+        from short_compared_log
+        <include refid="findWhereSql"></include>
+        order by creat_time desc
+        limit #{page}, #{pageSize}
+    </select>
+
+    <select id="selectComparedLogCountByParams" resultType="long">
+        select count(id)
+        from short_compared_log
+        <include refid="findWhereSql"></include>
+    </select>
+
+    <sql id="findWhereSql">
+        where 1= 1
+        <if test="shortUnitId != null">
+            and short_unit_id = #{shortUnitId}
+        </if>
+    </sql>
+
+    <update id="deleteByIds">
+        update affiche_info
+        set
+         state = 0,updater=#{updater}
+        where id in (
+        <foreach collection="ids" item="item" separator=",">
+            #{item}
+        </foreach>
+        )
+    </update>
+    <insert id="insertAfficheInfoToAllUser">
+        insert into affiche_user
+        (affche_id,user_id)
+        values
+        <foreach collection="userIds" item="user" separator=",">
+            (
+             #{affcheId}, #{user}
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteAfficheUserByAffcheIds">
+        delete FROM affiche_user
+        where affche_id in (
+        <foreach collection="affcheIds" item="item" separator=",">
+            #{item}
+        </foreach>
+        )
+
+    </delete>
+
+</mapper>
\ No newline at end of file