From 05bd97aab35b27be282fd45d013e1330edda2cc0 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期二, 29 六月 2021 16:21:53 +0800
Subject: [PATCH] 修复bug-401-【综治后台管理--事件管理】搜索事件功能未生效
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 448 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 438 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index 937df4a..efc4818 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -1,24 +1,46 @@
package com.panzhihua.service_grid.service.impl;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
+import com.panzhihua.common.enums.EventTasksStatusEnum;
+import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
+import com.panzhihua.common.model.dtos.EventResourceDTO;
+import com.panzhihua.common.model.dtos.IdDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.model.query.visit.EventTasksQuery;
+import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventVisitingTasksDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
-import com.panzhihua.service_grid.dao.*;
-import com.panzhihua.service_grid.model.dos.*;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
+import com.panzhihua.common.model.vos.visit.*;
+import com.panzhihua.common.utlis.CopyUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_grid.dao.EventResourceMapper;
+import com.panzhihua.service_grid.dao.EventVisitingTasksMapper;
+import com.panzhihua.service_grid.model.dos.EventResourceDO;
+import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
+import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.util.*;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @auther lyq
@@ -31,8 +53,19 @@
@Resource
private EventVisitingTasksMapper eventVisitingTasksMapper;
+
+ @Resource
+ private EventResourceMapper eventResourceMapper;
+
+ @Resource
+ private EventResourceService eventResourceService;
+
+ @Value("${domain.aesKey:}")
+ private String aesKey;
+
/**
* 新增重点人群走访记录
+ *
* @param eventVisitingTasksAddDTO
* @return 新增结果
*/
@@ -74,11 +107,12 @@
if(pageEventVisitingTasksDTO.getPageSize()!=null) {
page.setSize(pageEventVisitingTasksDTO.getPageSize());
}
- return R.ok(eventVisitingTasksMapper.findByPage(page, pageEventVisitingTasksDTO));
+ return R.ok();
}
/**
* 删除重点人群走访记录
+ *
* @param EventVisitingTasksDeleteDTO
* @return 平台用户信息
*/
@@ -88,6 +122,7 @@
/**
* 查询重点人群走访记录详细信息
+ *
* @param id 重点人群走访记录 id
* @return 查找结果
*/
@@ -96,9 +131,402 @@
if(eventVisitingTasksDO!=null) {
EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
+ eventVisitingTasksDetailsVO.setImgList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,1));
+ eventVisitingTasksDetailsVO.setVosList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,2));
+ eventVisitingTasksDetailsVO.setVideoList(eventResourceMapper.findListByRefId(eventVisitingTasksDO.getId(),2,3));
return R.ok(eventVisitingTasksDetailsVO);
}
return R.fail();
}
+ @Override
+ public R count(Long communityId) {
+
+ Map<String,Long> countMap = eventVisitingTasksMapper.count(communityId);
+ EventVisitCountVO eventVisitCountVO = new EventVisitCountVO();
+ eventVisitCountVO.setVisit(countMap.get("visit"));
+ eventVisitCountVO.setVisited(countMap.get("visited"));
+ eventVisitCountVO.setCanceled(countMap.get("canceled"));
+ return R.ok(eventVisitCountVO);
+ }
+
+ @Override
+ public R taskList(EventTasksQuery query) throws Exception{
+
+ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
+ for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){
+ if(eventVisitingTasksVO.getNationCode() != null){
+ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
+ }
+ }
+ return R.ok(page);
+ }
+
+ @Override
+ public R appTaskList(EventTasksQuery query) throws Exception{
+
+ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.appFindListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
+ for(EventVisitingTasksVO eventVisitingTasksVO:page.getRecords()){
+ if(eventVisitingTasksVO.getNationCode() != null){
+ eventVisitingTasksVO.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
+ }
+ }
+ return R.ok(page);
+ }
+
+ @Transactional
+ @Override
+ public R delete(IdDTO idDTO, Long communityId) {
+ StringBuilder rt = new StringBuilder();
+ String[] idarr = idDTO.getId().split(",");
+ for(String id:idarr){
+ if(StringUtils.isEmpty(id)){
+ continue;
+ }
+ String error = toDelete(Long.valueOf(id));
+ if(!StringUtils.isEmpty(error)){
+ rt.append(rt);
+ }
+ }
+ if(!StringUtils.isEmpty(rt)){
+ return R.fail("部分删除失败:"+rt.toString());
+ }
+ return R.ok();
+ }
+
+ private String toDelete(Long id) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null){
+ return "["+id+"]数据不存在;";
+ }
+ if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
+ return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
+ }
+ eventVisitingTasksMapper.deleteById(Long.valueOf(id));
+ return null;
+ }
+
+ @Override
+ public R visitorList(EventVisitListQuery query) {
+ IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
+ page.getRecords().stream().forEach(e->{
+ List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id").last("limit 0,1"));
+ if(!CollectionUtils.isEmpty(list)){
+ e.setCreateAt(list.get(0).getCreateAt());
+ e.setEventStatus(list.get(0).getEventStatus());
+ }
+ });
+ return R.ok(page);
+ }
+
+ @Override
+ public R list(EventTasksQuery query) {
+ IPage<AppVisitTasksVO> page = eventVisitingTasksMapper.list(new Page(query.getPageNum(),query.getPageSize()),query);
+ return R.ok(page);
+ }
+
+ @Override
+ public R detail(Long id) throws Exception {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO!=null) {
+ EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
+ BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
+ JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
+ eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
+ if(jsonObject != null && jsonObject.get("check") != null){
+ eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString());
+ }
+ return R.ok(eventVisitingTasksDetailsVO);
+ }
+ return R.fail();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public R add(IdDTO idDTO, Long communityId, Long userId) throws Exception {
+
+// Map<String,Object> map = eventVisitingTasksMapper.findUserByCommunityId(communityId,6);
+// if(CollectionUtils.isEmpty(map)){
+// return R.fail("网格员不存在");
+// }
+
+ StringBuilder rt = new StringBuilder();
+ String[] id = idDTO.getId().split(",");
+ for(String idstr:id){
+ if(StringUtils.isEmpty(idstr)){
+ continue;
+ }
+ String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
+ if(!StringUtils.isEmpty(error)){
+ rt.append(error);
+ }
+ }
+ if(!StringUtils.isEmpty(rt)){
+ return R.fail("部分新增失败"+rt.toString());
+ }
+ return R.ok();
+ }
+
+ @Override
+ public List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception {
+ IPage<EventVisitingTasksVO> page = eventVisitingTasksMapper.findListByPage(new Page(query.getPageNum(),query.getPageSize()),query);
+ return page.getRecords();
+ }
+
+ private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
+
+ Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
+ if(CollectionUtils.isEmpty(map)){
+ return "被访问人ID["+id+"]不存在;";
+ }
+
+ Integer count = eventVisitingTasksMapper.countNoneComplete(id);
+ if(count > 0){
+ return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
+ }
+ EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
+// visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
+// visitingTasksDO.setGridMemberCommunity(communityId);
+// visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
+// visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
+// visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
+ visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
+ visitingTasksDO.setVisiterName(map.get("name").toString());
+ visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
+ visitingTasksDO.setVisiterTele(map.get("phone") == null ?null:map.get("phone").toString());
+ StringBuilder sb = new StringBuilder();
+ sb.append(map.get("address")).append(map.get("road")).append(map.get("door_no")).append(map.get("floor")).append("栋").append(map.get("unit_no")).append("单元").append(map.get("house_no")).append("号");
+ visitingTasksDO.setVisiterAddress(sb.toString());
+ visitingTasksDO.setVisiterType(0);
+ visitingTasksDO.setActOpara(0);
+ if(map.get("lat") != null && map.get("lng") != null){
+ visitingTasksDO.setHappentLatLng(map.get("lat")+","+map.get("lng"));
+ }
+ visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
+ visitingTasksDO.setReporting(0);
+ visitingTasksDO.setInvalid(false);
+ visitingTasksDO.setUrgent(false);
+ visitingTasksDO.setUrgentDell(false);
+ visitingTasksDO.setCreateBy(userId);
+ visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null?null:Integer.valueOf(map.get("out_or_local").toString()));
+
+ if(map.get("label") != null){
+ List<String> option = getOption(map.get("label").toString());
+ if(!CollectionUtils.isEmpty(option)){
+ JSONObject json = new JSONObject();
+ json.put("option",option);
+ visitingTasksDO.setTableContentJson(json.toJSONString());
+ }
+ }
+
+ eventVisitingTasksMapper.insert(visitingTasksDO);
+ return null;
+ }
+
+ private List<String> getOption(String label) {
+ List<String> option = new ArrayList<>();
+ if(!Objects.isNull(label)) {
+ if (label.contains("精神障碍")) {
+ option.add("精神障碍异常1");
+ option.add("精神障碍异常2");
+ option.add("精神障碍异常3");
+ option.add("精神障碍异常4");
+
+ } else if (label.contains("吸毒")) {
+ option.add("疑似复吸");
+ option.add("失联");
+ option.add("复吸");
+ option.add("空挂户");
+ } else if (label.contains("刑满释放")) {
+ option.add("刑满释放异常1");
+ option.add("刑满释放异常2");
+ option.add("刑满释放异常3");
+ option.add("刑满释放异常4");
+ } else if (label.contains("社区矫正")) {
+ option.add("社区矫正异常1");
+ option.add("社区矫正异常2");
+ option.add("社区矫正异常3");
+ option.add("社区矫正异常4");
+ }
+ }
+ return option;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public R cancel(Long id) {
+
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
+ return R.fail("当前状态不可撤销");
+ }
+ int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
+ if(rt > 0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public R reset(Long id) {
+
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
+ return R.fail("当前状态不可恢复");
+ }
+ int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
+ if(rt > 0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public synchronized R start(Long id,Long userId) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
+ return R.fail("当前状态不可开始走访");
+ }
+ Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId);
+ EventVisitingTasksDO start = new EventVisitingTasksDO();
+ start.setId(id);
+ start.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
+ start.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
+ start.setGridMember(Long.valueOf(map.get("user_id").toString()));
+ start.setGridMemberName(map.get("name").toString());
+ start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
+ start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
+ int rt = eventVisitingTasksMapper.start(start);
+ if(rt > 0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public R complete(EventVisitCompleteDTO taskCompleteDTO) {
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(taskCompleteDTO.getId());
+ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
+ return R.fail("当前状态不可完成走访");
+ }
+ EventVisitingTasksDO complete = new EventVisitingTasksDO();
+ BeanUtils.copyProperties(taskCompleteDTO,complete);
+ if(taskCompleteDTO.getException().intValue() == 0){
+ complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
+ }else{
+ complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
+ }
+ complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
+ JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
+ json.put("check",taskCompleteDTO.getOption());
+ complete.setTableContentJson(json.toJSONString());
+
+ if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){
+ taskCompleteDTO.getImgList().forEach(e->{
+ createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,1,e);
+ });
+ }
+ if(!CollectionUtils.isEmpty(taskCompleteDTO.getVosList())){
+ taskCompleteDTO.getVosList().forEach(e->{
+ createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,2,e);
+ });
+ }
+ if(!CollectionUtils.isEmpty(taskCompleteDTO.getVideoList())){
+ taskCompleteDTO.getVosList().forEach(e->{
+ createResource(eventVisitingTasksDO.getId(),taskCompleteDTO.getUserId(),2,3,e);
+ });
+ }
+
+ Map<String,Object> map = eventVisitingTasksMapper.findUserById(taskCompleteDTO.getUserId());
+ complete.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
+ complete.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
+ complete.setGridMember(Long.valueOf(map.get("user_id").toString()));
+ complete.setGridMemberName(map.get("name").toString());
+ complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
+
+ int rt = eventVisitingTasksMapper.complete(complete);
+ if(rt > 0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+
+ private void createResource(Long id, Long dellUserId, int classification, int type, EventResourceDTO resourceDTO) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setRefId(id);
+ eventResourceDO.setClassification(classification);
+ eventResourceDO.setType(type);
+ eventResourceDO.setCreateBy(dellUserId);
+ eventResourceDO.setUrl(resourceDTO.getUrl());
+ eventResourceDO.setResourceTime(resourceDTO.getResourceTime());
+ eventResourceMapper.insert(eventResourceDO);
+ }
+
+ @Override
+ public List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
+ List<LcEventVisitingTasksListDTO> lcEventVisitingTasksList =new ArrayList<>();
+ List<EventVisitingTasksDO> eventVisitingTasksList = baseMapper.selectList(
+ new QueryWrapper<EventVisitingTasksDO>()
+ .eq("lc_upload", false)
+ .eq("event_status",2)
+ );
+ lcEventVisitingTasksList= CopyUtil.beanCopyList(eventVisitingTasksList,LcEventVisitingTasksListDTO.class);
+ lcEventVisitingTasksList.forEach(visitingTasks -> {
+ addVisitingTasksFile(visitingTasks);
+ });
+ return lcEventVisitingTasksList;
+ }
+
+ private LcEventVisitingTasksListDTO addVisitingTasksFile(LcEventVisitingTasksListDTO visitingTasks) {
+ //查询事件关联附件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 2)
+ .eq(EventResourceDO::getRefId, visitingTasks.getId())
+ );
+ List<EventResourceVO> picList = new ArrayList<>();
+ List<EventResourceVO> audioList = new ArrayList<>();
+ List<EventResourceVO> videoList = new ArrayList<>();
+ eventResourceDOList.forEach(eventResourceDO -> {
+ switch (eventResourceDO.getType()) {
+ case 1:
+ EventResourceVO picEventResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
+ picList.add(picEventResourceVO);
+ break;
+ case 2:
+ EventResourceVO audioResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
+ audioList.add(audioResourceVO);
+ break;
+ case 3:
+ EventResourceVO videoResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
+ videoList.add(videoResourceVO);
+ break;
+ }
+ });
+ visitingTasks.setAudios(audioList);
+ visitingTasks.setPics(picList);
+ visitingTasks.setVideos(videoList);
+ return visitingTasks;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateLcUploadFlagVisitingTask(Long id) {
+ EventVisitingTasksDO eventVisitingTasksDO = baseMapper.selectById(id);
+ eventVisitingTasksDO.setLcUpload(true);
+ int flag = baseMapper.updateById(eventVisitingTasksDO);
+ if (flag > 0) {
+ return true;
+ }
+ return false;
+ }
+
+
}
--
Gitblit v1.7.1