bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
liux 2025-09-29 17:28:43 +08:00
parent 40220f8704
commit 5529965946
4 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java
View File

@ -136,7 +136,7 @@ public class ImsInventoryController extends BaseController
@GetMapping({"/expire/warning"})
@ApiOperation("过期预警")
public TableDataInfo expireWarning(ExpireWarningDTO content) {
startPage();
// startPage();
if(content !=null && content.getAreaId() != null ) {
content.setAreaIdList(Collections.singletonList(content.getAreaId()));
}
@ -144,7 +144,7 @@ public class ImsInventoryController extends BaseController
content.setWarehouseIdList(Collections.singletonList(content.getWarehouseId()));
}
List<ExpireWarningVO> inventoryWarningList = this.imsInventoryService.expireWarning(content);
return getDataTable(inventoryWarningList);
return getDataTable1(inventoryWarningList);
}

67
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/user/service/impl/UserFaceServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
import com.bonus.canteen.core.common.utils.FileUrlUtil;
import com.bonus.canteen.core.common.utils.HttpClient;
import com.bonus.canteen.core.common.utils.MqUtil;
import com.bonus.canteen.core.kitchen.domain.KitchenStaffFace;
import com.bonus.canteen.core.user.domain.AppUserFace;
import com.bonus.canteen.core.user.domain.DeviceMqPersonalUpdateMessageDTO;
import com.bonus.canteen.core.user.utils.ArcFaceHelper;
@ -68,27 +69,49 @@ public class UserFaceServiceImpl implements IUserFaceService {
} else {
long startTime = System.currentTimeMillis();
//发送请求 调用人脸特征提取接口
String url = FileUrlUtil.getFileUrl(dto.getPhotoUrl());
System.out.println("人脸特征提取url：" + url);
String response = FaceFeatureDetector.detectFaceFeature(url);
System.out.println("人脸特征提取接口返回结果：" + response);
JSONObject jsonResponse = JSONObject.parseObject(response.toString());
if (jsonResponse.getInteger("code") != 30002) {
System.out.println("人脸特征提取失败，" + jsonResponse.getString("msg"));
log.error("人脸特征提取失败，{}", jsonResponse.getString("msg"));
throw new ServiceException("人脸特征提取失败，" + jsonResponse.getString("msg"));
}
long endTime = System.currentTimeMillis();
System.out.println("人脸特征提取耗时：" + (endTime - startTime) + "ms");
List<UserFace> list = new ArrayList<>();
String dataStr = jsonResponse.getString("data");
// 将data字符串解析为JSONArray
JSONArray dataArray = JSONArray.parseArray(dataStr);
if (dataArray != null && !dataArray.isEmpty()) {
Object faceFeature = dataArray.get(0);
// String url = FileUrlUtil.getFileUrl(dto.getPhotoUrl());
// System.out.println("人脸特征提取url：" + url);
// String response = FaceFeatureDetector.detectFaceFeature(url);
// System.out.println("人脸特征提取接口返回结果：" + response);
// JSONObject jsonResponse = JSONObject.parseObject(response.toString());
// if (jsonResponse.getInteger("code") != 30002) {
// System.out.println("人脸特征提取失败，" + jsonResponse.getString("msg"));
// log.error("人脸特征提取失败，{}", jsonResponse.getString("msg"));
// throw new ServiceException("人脸特征提取失败，" + jsonResponse.getString("msg"));
// }
// long endTime = System.currentTimeMillis();
// System.out.println("人脸特征提取耗时：" + (endTime - startTime) + "ms");
// List<UserFace> list = new ArrayList<>();
// String dataStr = jsonResponse.getString("data");
// // 将data字符串解析为JSONArray
// JSONArray dataArray = JSONArray.parseArray(dataStr);
// if (dataArray != null && !dataArray.isEmpty()) {
// Object faceFeature = dataArray.get(0);
// UserFace faceVO = new UserFace();
// faceVO.setErrorMsg("[软件]成功");
// faceVO.setFeatures(faceFeature.toString());
// faceVO.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
// faceVO.setUserId(dto.getUserId());
// faceVO.setPhotoUrl(dto.getPhotoUrl());
// faceVO.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
// faceVO.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
// faceVO.setCreateTime(DateUtils.getTime());
// faceVO.setUpdateTime(DateUtils.getTime());
// list.add(faceVO);
// int code = userFaceMapper.insertUserFace(list.get(0));
// if (code == 0) {
// System.out.println("[人脸识别算法]：保存失败");
// log.error("[人脸识别算法]：保存失败");
// throw new ServiceException("[人脸识别算法]：保存失败");
// }
// DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePersonPhoto(dto.getUserId().intValue(), "update");
// MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4);
// } else {
// throw new ServiceException("人脸特征提取失败，未检测到人脸");
// }
UserFace faceVO = new UserFace();
faceVO.setErrorMsg("[软件]成功");
faceVO.setFeatures(faceFeature.toString());
faceVO.setFeatures("");
faceVO.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
faceVO.setUserId(dto.getUserId());
faceVO.setPhotoUrl(dto.getPhotoUrl());
@ -96,8 +119,7 @@ public class UserFaceServiceImpl implements IUserFaceService {
faceVO.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
faceVO.setCreateTime(DateUtils.getTime());
faceVO.setUpdateTime(DateUtils.getTime());
list.add(faceVO);
int code = userFaceMapper.insertUserFace(list.get(0));
int code = userFaceMapper.insertUserFace(faceVO);
if (code == 0) {
System.out.println("[人脸识别算法]：保存失败");
log.error("[人脸识别算法]：保存失败");
@ -105,9 +127,6 @@ public class UserFaceServiceImpl implements IUserFaceService {
}
DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePersonPhoto(dto.getUserId().intValue(), "update");
MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4);
} else {
throw new ServiceException("人脸特征提取失败，未检测到人脸");
}
}
return AjaxResult.success();
}

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
View File

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.nick_name as nickName,
ac.account_id as accId,
'' as cardNum,
ac.serial_num as serialNum,
if(ac.card_status != '1',null,ac.serial_num ) as serialNum,
ai.account_status as accStatus,
su.phonenumber as phone,
su.login_type as loginType
@ -59,4 +59,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
</mapper>
</mapper>

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportInventoryMapper.xml
View File

@ -279,7 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
de.inventory_num balanceCount,
de.out_into_amount outAmount,
de.total_amount balanceAmount,
de.fetch_user_id as fetchUserName,
susu.user_name as fetchUserName,
de.product_date,
de.expire_time,
de.record_id,
@ -291,6 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ims_warehouse_info dw on dw.warehouse_id = de.warehouse_id
left join basic_area aa on dw.area_id = aa.area_id
LEFT JOIN ims_supplier ds ON de.supplier_id = ds.supplier_id
LEFT JOIN sys_user susu on de.fetch_user_id = susu.user_id
where de.record_type=2
<if test="param.startDate != null and param.startDate.trim() != ''">
and de.record_date <![CDATA[ >= ]]> #{param.startDate}