diff --git a/bonus-business/src/main/java/com/bonus/business/robot/util/ImageDownloader.java b/bonus-business/src/main/java/com/bonus/business/robot/util/ImageDownloader.java
index 2beee3d..f89ef55 100644
--- a/bonus-business/src/main/java/com/bonus/business/robot/util/ImageDownloader.java
+++ b/bonus-business/src/main/java/com/bonus/business/robot/util/ImageDownloader.java
@@ -55,7 +55,7 @@ public class ImageDownloader {
outputStream.write(buffer, 0, len);
}
- System.out.println("图片下载成功: " + file.getAbsolutePath());
+ // System.out.println("图片下载成功: " + file.getAbsolutePath());
return true;
} catch (Exception e) {
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/IUploadFileServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/IUploadFileServiceImpl.java
index c6647c7..258f3ee 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/IUploadFileServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/IUploadFileServiceImpl.java
@@ -48,7 +48,7 @@ public class IUploadFileServiceImpl implements IUploadFileService {
@Override
public boolean delFile(String path) {
try{
- File file=new File(RuoYiConfig.getUploadUserImage()+path);
+ File file=new File(RuoYiConfig.getUploadPath()+path);
return file.delete();
}catch (Exception e){
log.error(e.toString(),e);
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java
index eddb945..a33dad2 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotEventXmlServiceImpl.java
@@ -240,7 +240,7 @@ public class RobotEventXmlServiceImpl implements IRobotEventXmlService {
if(imageUrl!=null){
double value= ImageSimilarityUtils.compareImages(filePath+lastPath,filePath+imageUrl.getImage());
String formattedValue = String.format("%.2f", value*100);
- vo=new RobotTaskImageVo(uuid,taskId,positionId,taskTime,lastPath,imageUrl.getImage(),imageUrl.getLastImage(),formattedValue);
+ vo=new RobotTaskImageVo(uuid,taskId,positionId,taskTime,lastPath,imageUrl.getImage(),imageUrl.getTaskTime(),formattedValue);
}else{
vo=new RobotTaskImageVo(uuid,taskId,positionId,taskTime,lastPath,null,null,null);
}
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotImageServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotImageServiceImpl.java
index 4b58ec4..34b7627 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/RobotImageServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/RobotImageServiceImpl.java
@@ -65,7 +65,7 @@ public class RobotImageServiceImpl implements IRobotImageService {
map.put("allTask",allTask);
//巡检照片
int dayImage=mapper.getTaskImage("day");
- int allImage=mapper.getTaskNum(null);
+ int allImage=mapper.getTaskImage(null);
map.put("dayImage",dayImage);
map.put("allImage",allImage);
//对比次数
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java
index 7641fa8..a16923c 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/SbdUserServiceImpl.java
@@ -74,6 +74,8 @@ public class SbdUserServiceImpl implements ISbdUserService {
}
user.setImage(path);
+ }else{
+ user.setImage(vo.getImage());
}
int num= mapper.updateSbdUser(user);
if(num>0){
diff --git a/bonus-business/src/main/java/com/bonus/business/vo/RobotUserInfoVo.java b/bonus-business/src/main/java/com/bonus/business/vo/RobotUserInfoVo.java
index 216d324..869d126 100644
--- a/bonus-business/src/main/java/com/bonus/business/vo/RobotUserInfoVo.java
+++ b/bonus-business/src/main/java/com/bonus/business/vo/RobotUserInfoVo.java
@@ -56,9 +56,9 @@ public class RobotUserInfoVo {
*/
private String workType;
- private String startTime;
+ private String startDay;
- private String endTime;
+ private String endDay;
diff --git a/bonus-business/src/main/java/com/bonus/business/vo/SbdUserVo.java b/bonus-business/src/main/java/com/bonus/business/vo/SbdUserVo.java
index a4a26fc..a4382ac 100644
--- a/bonus-business/src/main/java/com/bonus/business/vo/SbdUserVo.java
+++ b/bonus-business/src/main/java/com/bonus/business/vo/SbdUserVo.java
@@ -4,6 +4,9 @@ import lombok.Data;
import javax.validation.constraints.Size;
+/**
+ * @author 黑子
+ */
@Data
public class SbdUserVo {
diff --git a/bonus-business/src/main/resources/mapper/robot/SbdUserMapper.xml b/bonus-business/src/main/resources/mapper/robot/SbdUserMapper.xml
index 79575eb..9a7f67d 100644
--- a/bonus-business/src/main/resources/mapper/robot/SbdUserMapper.xml
+++ b/bonus-business/src/main/resources/mapper/robot/SbdUserMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select user_name userName, sex ,post,image,work_type workType,mobile,create_time createTime,data_source dataSource,
age,id_card idCard
from robot_sbd_user
- WHERE del_flag=0
+ WHERE id=#{id}