zjk/SchoolFood
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

晨检,垃圾处理,自检,食堂,留样管理改进

Browse Source
This commit is contained in:
林华觞
2025-06-26 15:09:09 +08:00
parent 906fbfd389
commit ec34635a82
17 changed files with 85 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppCattenController.java
View File

@@ -8,7 +8,10 @@ import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
import com.zf.foodpurchase.common.core.page.TableDataInfo;
import com.zf.foodpurchase.common.valigroud.AddGroup;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.common.valigroud.WxAddGroup;
import com.zf.foodpurchase.common.valigroud.WxUpdateGroup;
import com.zf.foodpurchase.fdsafe.service.ICattenService;
import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
import com.zf.foodpurchase.fdsafe.vo.CattenVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -42,22 +45,26 @@ public class WxAppCattenController extends BaseController {
}
@PostMapping("/add")
public AjaxResult add(@Validated(AddGroup.class) @RequestBody CattenVO cattenVO) {
public AjaxResult add(@Validated(WxAddGroup.class) @RequestBody CattenVO cattenVO) {
WxAppUserVO userVO = getWxAppLoginUser().getUser();
if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
return AjaxResult.error("非学校人员账号无法操作");
}
cattenVO.setSchoolId(userVO.getSchoolId());
cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
return cattenService.saveVO(cattenVO);
}
@PostMapping("/update")
public AjaxResult update(@Validated(UpdateGroup.class) @RequestBody CattenVO cattenVO) {
public AjaxResult update(@Validated(WxUpdateGroup.class) @RequestBody CattenVO cattenVO) {
WxAppUserVO userVO = getWxAppLoginUser().getUser();
if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
return AjaxResult.error("非学校人员账号无法操作");
}
cattenVO.setSchoolId(userVO.getSchoolId());
cattenVO.setLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxLicenseImg()));
cattenVO.setFoodLicenseImg(ArrayStringUtils.wxImgToArray(cattenVO.getWxFoodLicenseImg()));
return cattenService.updateVO(cattenVO);
}

6
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
View File

@@ -8,6 +8,8 @@ import com.zf.foodpurchase.common.core.domain.entity.WxAppUserVO;
import com.zf.foodpurchase.common.core.page.TableDataInfo;
import com.zf.foodpurchase.common.valigroud.AddGroup;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.common.valigroud.WxAddGroup;
import com.zf.foodpurchase.common.valigroud.WxUpdateGroup;
import com.zf.foodpurchase.fdsafe.service.IFoodSampleService;
import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
import com.zf.foodpurchase.fdsafe.vo.FoodSampleVO;
@@ -43,7 +45,7 @@ public class WxAppFoodSampleController extends BaseController {
}
@PostMapping("/add")
public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodSampleVO foodSampleVO) {
public AjaxResult add(@RequestBody @Validated(WxAddGroup.class) FoodSampleVO foodSampleVO) {
WxAppUserVO userVO = getWxAppLoginUser().getUser();
if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
return AjaxResult.error("非学校人员账号无法操作");
@@ -55,7 +57,7 @@ public class WxAppFoodSampleController extends BaseController {
}
@PostMapping("/update")
public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodSampleVO foodSampleVO) {
public AjaxResult update(@RequestBody @Validated(WxUpdateGroup.class) FoodSampleVO foodSampleVO) {
WxAppUserVO userVO = getWxAppLoginUser().getUser();
if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
return AjaxResult.error("非学校人员账号无法操作");

3
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppMorningInspectionDetailController.java
View File

@@ -10,6 +10,7 @@ import com.zf.foodpurchase.common.valigroud.AddGroup;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.fdsafe.service.IMorningInspectionContentService;
import com.zf.foodpurchase.fdsafe.service.IMorningInspectionDetailService;
import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
import com.zf.foodpurchase.fdsafe.vo.MorningInspectionDetailVO;
import com.zf.foodpurchase.fdsafe.vo.MorningTableHeaderVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +88,7 @@ public class WxAppMorningInspectionDetailController extends BaseController {
if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
return AjaxResult.error("非学校人员账号无法操作");
}
morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(morningInspectionDetailVO.getWxAbnormalImg()));
return morningInspectionDetailService.saveVO(morningInspectionDetailVO);
}
@@ -96,6 +98,7 @@ public class WxAppMorningInspectionDetailController extends BaseController {
if(userVO == null || !WxAPPAccountConstants.SCHOOL.equals(userVO.getAccountType())){
return AjaxResult.error("非学校人员账号无法操作");
}
morningInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(morningInspectionDetailVO.getWxAbnormalImg()));
return morningInspectionDetailService.updateVO(morningInspectionDetailVO);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppRubbishDealController.java
View File

@@ -51,7 +51,7 @@ public class WxAppRubbishDealController extends BaseController {
}
rubbishDealVO.setSchoolId(userVO.getSchoolId());
// 图片处理
rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImage()));
rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
return rubbishDealService.saveVO(rubbishDealVO);
}
@@ -63,7 +63,7 @@ public class WxAppRubbishDealController extends BaseController {
}
rubbishDealVO.setSchoolId(userVO.getSchoolId());
// 图片处理
rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImage()));
rubbishDealVO.setDealImg(ArrayStringUtils.wxImgToArray(rubbishDealVO.getWxDealImg()));
return rubbishDealService.updateVO(rubbishDealVO);
}

16
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppSelfInspectionRecordController.java
View File

@@ -11,10 +11,12 @@ import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.fdsafe.service.ISelfInspectionContentService;
import com.zf.foodpurchase.fdsafe.service.ISelfInspectionDetailService;
import com.zf.foodpurchase.fdsafe.service.ISelfInspectionRecordService;
import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
import com.zf.foodpurchase.fdsafe.vo.SelfInspectionContentVO;
import com.zf.foodpurchase.fdsafe.vo.SelfInspectionDetailVO;
import com.zf.foodpurchase.fdsafe.vo.SelfInspectionRecordVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -71,6 +73,13 @@ public class WxAppSelfInspectionRecordController extends BaseController {
}
selfInspectionRecordVO.setSchoolId(userVO.getSchoolId());
selfInspectionRecordVO.setEduId(userVO.getEduId());
// 监督自查图片处理
List<SelfInspectionDetailVO> selfInspectionDetailVOList = selfInspectionRecordVO.getSelfInspectionDetailVOList();
if(!CollectionUtils.isEmpty(selfInspectionDetailVOList)){
for (SelfInspectionDetailVO selfInspectionDetailVO : selfInspectionDetailVOList) {
selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(selfInspectionDetailVO.getWxAbnormalImg()));
}
}
return selfInspectionRecordService.saveVO(selfInspectionRecordVO);
}
@@ -81,6 +90,13 @@ public class WxAppSelfInspectionRecordController extends BaseController {
return AjaxResult.error("非学校人员账号无法操作");
}
selfInspectionRecordVO.setSchoolId(userVO.getSchoolId());
// 监督自查图片处理
List<SelfInspectionDetailVO> selfInspectionDetailVOList = selfInspectionRecordVO.getSelfInspectionDetailVOList();
if(!CollectionUtils.isEmpty(selfInspectionDetailVOList)){
for (SelfInspectionDetailVO selfInspectionDetailVO : selfInspectionDetailVOList) {
selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.wxImgToArray(selfInspectionDetailVO.getWxAbnormalImg()));
}
}
return selfInspectionRecordService.updateVO(selfInspectionRecordVO);
}