Merge remote-tracking branch 'origin/master'

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java

@@ -155,7 +155,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl<AlarmHandleMapper, A
 	 */
 	@Override
 	public List<User> handleUser() {
-		List<User> users = userClient.userListByDeptAndChildrenWithAuth(Long.valueOf(AuthUtil.getUser().getDeptId())).getData();
+		List<User> users = userClient.userList(AuthUtil.getTenantId(), Long.valueOf(AuthUtil.getDeptId())).getData();
 		return users.stream().distinct().collect(Collectors.toList());
 	}
 

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java

@@ -27,4 +27,6 @@ public interface DataService {
 	List<AnalyzeDataConditionVO> periodTargetSignages(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, List<String> signages);
 
 	Float  periodTargetFloat(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, Integer ride ,String signages);
+
+	void multipleTargetData(String startTime, String endTime);
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java

@@ -11,6 +11,8 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO;
 import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO;
 import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO;
 import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO;
+import com.hnac.hzinfo.sdk.v5.device.DeviceDataClient;
+import com.hnac.hzinfo.sdk.v5.device.dto.HisDataDeviceDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
@@ -22,7 +24,10 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -34,6 +39,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class DataServiceImpl implements DataService {
 
+	private final DeviceDataClient deviceDataClient;
+
 	private final IAnalyseDataSearchClient analyseDataSearchClient;
 
 	@Override
@@ -196,4 +203,10 @@ public class DataServiceImpl implements DataService {
 	}
 
 
+	@Override
+	public void multipleTargetData(String startTime, String endTime) {
+		HisDataDeviceDTO his = new HisDataDeviceDTO();
+		deviceDataClient.getHisDataByMultipleDeviceCode(his);
+	}
+
 }

hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java

@@ -198,9 +198,7 @@ public class MessageClient extends BladeController implements IMessageClient{
 				record.setStatus(MessageConstants.NOT_PUSH);
 				Map<String, String> params = smsImmediatelyPushDTO.getParams();
 				int maxSize=35;
-				for (Map.Entry<String, String> stringStringEntry : params.entrySet()) {
+                params.replaceAll((k, v) -> getTruncateString(v, maxSize));
-					params.put(stringStringEntry.getKey(),getTruncateString(stringStringEntry.getValue(), maxSize));
-				}
 				record.setSmsParam(JSON.toJSONString(params));
 				Boolean flag = recordService.sendSmsImmediatelyMsg(record);
 				if (!flag) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java

@@ -1258,7 +1258,7 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService {
             map.put(mon, list);
         });
         // 推送当月报表邮件
-//        this.sendMonthReport(map, R.getData());
+        this.sendMonthReport(map, R.getData());
         redisTemplate.opsForValue().set(area_month_report_key, map);
     }
     /**