From 1b5a4f37772c00f4fdfe3c053095a86638532cc8 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 16 Mar 2021 20:09:28 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A3=9F=E6=9D=90=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/domain/SysIngredentFile.java | 4 +- .../stdiet/custom/domain/SysIngredient.java | 3 + .../custom/mapper/SysIngredientMapper.java | 2 +- .../impl/SysIngredientServiceImpl.java | 30 ++-- .../mapper/custom/SysIngredientMapper.xml | 5 +- stdiet-ui/src/components/FileUpload/index.vue | 60 +++++++ .../src/views/custom/ingredient/index.vue | 147 ++++++++++++------ 7 files changed, 187 insertions(+), 64 deletions(-) create mode 100644 stdiet-ui/src/components/FileUpload/index.vue diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java index ceab8eccd..fa7eef4a4 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java @@ -17,11 +17,11 @@ public class SysIngredentFile { Integer delFlag; - Long createBy; + String createBy; Date createTime; - Long updateBy; + String updateBy; Date updateTime; } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java index 4f52f9902..0898611a0 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java @@ -6,6 +6,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 食材对象 sys_ingredient @@ -110,4 +111,6 @@ public class SysIngredient { */ private String info; + private List imgList; + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java index 8ac25d4aa..c8655fe19 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java @@ -83,5 +83,5 @@ public interface SysIngredientMapper */ public SysIngredient selectSysIngredientByName(@Param("name") String name); - int batchInsertIngredientImage(List ingredentFiles); + int batchInsertIngredientImage(List list); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java index c37cf6f08..fbfa31886 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java @@ -1,7 +1,9 @@ package com.stdiet.custom.service.impl; import com.stdiet.common.utils.DateUtils; +import com.stdiet.common.utils.SecurityUtils; import com.stdiet.common.utils.StringUtils; +import com.stdiet.custom.domain.SysIngredentFile; import com.stdiet.custom.domain.SysIngredient; import com.stdiet.custom.domain.SysIngredientNotRec; import com.stdiet.custom.domain.SysIngredientRec; @@ -61,26 +63,34 @@ public class SysIngredientServiceImpl implements ISysIngredientService { // insertNotRecommand(sysIngredient); // - - + if (StringUtils.isNotNull(sysIngredient.getImgList())) { + List fileList = sysIngredient.getImgList(); + for (SysIngredentFile file : fileList) { + file.setId(sysIngredient.getId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(DateUtils.getNowDate()); + } + sysIngredientMapper.batchInsertIngredientImage(fileList); + } return rows; } /** * 新增推荐标签 + * * @param ingredient */ public void insertRecommand(SysIngredient ingredient) { Long[] recIds = ingredient.getRecIds(); - if(StringUtils.isNotNull(recIds)) { + if (StringUtils.isNotNull(recIds)) { List list = new ArrayList(); - for(Long recId: recIds) { + for (Long recId : recIds) { SysIngredientRec rec = new SysIngredientRec(); rec.setIngredientId(ingredient.getId()); rec.setRecommandId(recId); list.add(rec); } - if(list.size() > 0) { + if (list.size() > 0) { sysIngredientMapper.batchIngredientRec(list); } } @@ -88,19 +98,20 @@ public class SysIngredientServiceImpl implements ISysIngredientService { /** * 新增不推荐标签 + * * @param ingredient */ public void insertNotRecommand(SysIngredient ingredient) { Long[] notRecIds = ingredient.getNotRecIds(); - if(StringUtils.isNotNull(notRecIds)) { + if (StringUtils.isNotNull(notRecIds)) { List list = new ArrayList(); - for(Long recId: notRecIds) { + for (Long recId : notRecIds) { SysIngredientNotRec notRec = new SysIngredientNotRec(); notRec.setIngredientId(ingredient.getId()); notRec.setRecommandId(recId); list.add(notRec); } - if(list.size() > 0) { + if (list.size() > 0) { sysIngredientMapper.batchIngredientNotRec(list); } } @@ -151,11 +162,12 @@ public class SysIngredientServiceImpl implements ISysIngredientService { /** * 根据食材名称查询食材信息 + * * @param name * @return */ @Override - public SysIngredient selectSysIngredientByName(String name){ + public SysIngredient selectSysIngredientByName(String name) { return sysIngredientMapper.selectSysIngredientByName(name); } } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml index 122e4bf06..4e6ad6777 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml @@ -21,7 +21,7 @@ - + @@ -126,6 +126,7 @@ update_by, update_time, review_status, + info, #{name}, @@ -140,6 +141,7 @@ #{updateBy}, #{updateTime}, #{reviewStatus}, + #{info}, @@ -194,6 +196,7 @@ update_by = #{updateBy}, update_time = #{updateTime}, review_status = #{reviewStatus}, + info = #{info}, where id = #{id} diff --git a/stdiet-ui/src/components/FileUpload/index.vue b/stdiet-ui/src/components/FileUpload/index.vue new file mode 100644 index 000000000..4fe046dee --- /dev/null +++ b/stdiet-ui/src/components/FileUpload/index.vue @@ -0,0 +1,60 @@ + + diff --git a/stdiet-ui/src/views/custom/ingredient/index.vue b/stdiet-ui/src/views/custom/ingredient/index.vue index 61fbff02c..4c58c211a 100644 --- a/stdiet-ui/src/views/custom/ingredient/index.vue +++ b/stdiet-ui/src/views/custom/ingredient/index.vue @@ -245,55 +245,17 @@ /> - - + + - + - + - - - - /100g - - - - - - /100g - - - - - - /100g - - - - - + + + - - + + + + + + + + + + + + + + + + + - + - + - - + + + + + + +
+ 将文件拖到此处，或点击上传 +
+
+ 最多可上传5个文件，且每个文件不超过10M +
+ + + + + + + + From 8124005e7e8fb776153d219aabafff847c707ec1 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 17 Mar 2021 13:45:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/domain/SysIngredentFile.java | 4 +- .../impl/SysIngredientServiceImpl.java | 2 +- .../mapper/custom/SysIngredientMapper.xml | 10 +- .../src/views/custom/ingredient/index.vue | 96 +++++++++++-------- 4 files changed, 64 insertions(+), 48 deletions(-) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java index fa7eef4a4..88effbaf9 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java @@ -11,9 +11,9 @@ public class SysIngredentFile { Long igdId; - String fileUrl; + String url; - String fileName; + String name; Integer delFlag; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java index fbfa31886..2db78fd55 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java @@ -66,7 +66,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService { if (StringUtils.isNotNull(sysIngredient.getImgList())) { List fileList = sysIngredient.getImgList(); for (SysIngredentFile file : fileList) { - file.setId(sysIngredient.getId()); + file.setIgdId(sysIngredient.getId()); file.setCreateBy(SecurityUtils.getUsername()); file.setCreateTime(DateUtils.getNowDate()); } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml index 4e6ad6777..261bfbe58 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml @@ -220,22 +220,22 @@ - insert into sys_ingredient_file(igd_id, file_url, file_name, create_by, create_time, update_by, update_time ) + insert into sys_ingredient_file(igd_id, url, name, create_by, create_time, update_by, update_time ) values - (#{item.ingredientId},#{item.fileUrl},#{item.fileName},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) + (#{item.igdId},#{item.url},#{item.name},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) - - + + diff --git a/stdiet-ui/src/views/custom/ingredient/index.vue b/stdiet-ui/src/views/custom/ingredient/index.vue index 4c58c211a..8e1b1c590 100644 --- a/stdiet-ui/src/views/custom/ingredient/index.vue +++ b/stdiet-ui/src/views/custom/ingredient/index.vue @@ -246,7 +246,7 @@ - + @@ -338,15 +338,32 @@ - - + + + + +
+ 将文件拖到此处，或点击上传 +
最多可上传5个文件，且每个文件不超过10M
+
+ + + + + - - - - -
- 将文件拖到此处，或点击上传 -
-
- 最多可上传5个文件，且每个文件不超过10M -
- - - - + - + { + const { name, url, response } = data; + if (response) { + return { url: response.fileUrl, name: response.fileName }; + } + return { url, name }; + }); + // console.log({ + // res, + // file, + // fileList, + // form: this.form, + // }); + }, + handleOnUploadRemove(file, fileList) { + this.form.imgList = fileList.map(({ url, name }) => ({ + url, + name, + })); + // console.log({ file, fileList, form: this.form }); + }, + handleOnUploadExceed(files, fileList) { + this.$message({ + message: "最多可上传5张图片", + type: "warning", + }); }, - handleOnUploadRemove() { - - } }, }; From 64d232d2d6906f4c1c6ea3b72913ad7cf994a609 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 17 Mar 2021 13:58:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A3=9F=E8=B0=B1?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stdiet-ui/src/views/custom/recipesShow/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/stdiet-ui/src/views/custom/recipesShow/utils.js b/stdiet-ui/src/views/custom/recipesShow/utils.js index 7acdc44c5..0d2dc6f37 100644 --- a/stdiet-ui/src/views/custom/recipesShow/utils.js +++ b/stdiet-ui/src/views/custom/recipesShow/utils.js @@ -14,6 +14,7 @@ export function getProcessMenuData(menuData) { name: cur.name, menuId: cur.menuId, methods: cur.methods, + remark: cur.remark, type: cur.type, isMain: cur.isMain, igdList: cur.igdList.reduce((igdArr, igdData) => { From 917f2ab975a89d14eb918528e73b016c8c8e22d0 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 17 Mar 2021 14:15:33 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A3=9F=E6=9D=90?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/mapper/SysIngredientMapper.java | 51 ++++++++++--------- .../impl/SysIngredientServiceImpl.java | 44 ++++++++++------ .../mapper/custom/SysIngredientMapper.xml | 14 ++--- 3 files changed, 63 insertions(+), 46 deletions(-) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java index c8655fe19..e8f7a718e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysIngredientMapper.java @@ -1,87 +1,90 @@ package com.stdiet.custom.mapper; -import java.util.List; - import com.stdiet.custom.domain.SysIngredentFile; import com.stdiet.custom.domain.SysIngredient; import com.stdiet.custom.domain.SysIngredientNotRec; import com.stdiet.custom.domain.SysIngredientRec; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 食材Mapper接口 - * + * * @author wonder * @date 2020-12-15 */ -public interface SysIngredientMapper -{ +public interface SysIngredientMapper { /** * 查询食材 - * + * * @param id 食材ID * @return 食材 */ - public SysIngredient selectSysIngredientById(Long id); + SysIngredient selectSysIngredientById(Long id); /** * 查询食材列表 - * + * * @param sysIngredient 食材 * @return 食材集合 */ - public List selectSysIngredientList(SysIngredient sysIngredient); + List selectSysIngredientList(SysIngredient sysIngredient); /** * 新增食材 - * + * * @param sysIngredient 食材 * @return 结果 */ - public int insertSysIngredient(SysIngredient sysIngredient); + int insertSysIngredient(SysIngredient sysIngredient); /** * 修改食材 - * + * * @param sysIngredient 食材 * @return 结果 */ - public int updateSysIngredient(SysIngredient sysIngredient); + int updateSysIngredient(SysIngredient sysIngredient); /** * 删除食材 - * + * * @param id 食材ID * @return 结果 */ - public int deleteSysIngredientById(Long id); + int deleteSysIngredientById(Long id); /** * 批量删除食材 - * + * * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteSysIngredientByIds(Long[] ids); + int deleteSysIngredientByIds(Long[] ids); - public int batchIngredientRec(List ingredientRecList); + int batchIngredientRec(List ingredientRecList); - public int batchIngredientNotRec(List ingredientNotRecList); + int batchIngredientNotRec(List ingredientNotRecList); - public int deleteIngredentRecByIngredientId(Long recId); + int deleteIngredientRecByIngredientId(Long recId); - public int deleteIngredentNotRecByIngredientId(Long notRecId); + int deleteIngredientNotRecByIngredientId(Long notRecId); - public int deleteIngredentRecByIngredientIds(Long[] id); + int deleteIngredientRecByIngredientIds(Long[] id); - public int deleteIngredentNotRecByIngredientIds(Long[] id); + int deleteIngredientNotRecByIngredientIds(Long[] id); /** * 根据食材名称查询食材信息 + * * @param name * @return */ - public SysIngredient selectSysIngredientByName(@Param("name") String name); + SysIngredient selectSysIngredientByName(@Param("name") String name); int batchInsertIngredientImage(List list); + + int deleteIngredientImageById(Long id); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java index 2db78fd55..d9adb3f08 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java @@ -63,15 +63,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService { // insertNotRecommand(sysIngredient); // - if (StringUtils.isNotNull(sysIngredient.getImgList())) { - List fileList = sysIngredient.getImgList(); - for (SysIngredentFile file : fileList) { - file.setIgdId(sysIngredient.getId()); - file.setCreateBy(SecurityUtils.getUsername()); - file.setCreateTime(DateUtils.getNowDate()); - } - sysIngredientMapper.batchInsertIngredientImage(fileList); - } + insertImageFiles(sysIngredient); return rows; } @@ -117,6 +109,26 @@ public class SysIngredientServiceImpl implements ISysIngredientService { } } + /** + * 新增图片 + * + * @param ingredient + */ + public void insertImageFiles(SysIngredient ingredient) { + if (StringUtils.isNotNull(ingredient.getImgList())) { + List fileList = ingredient.getImgList(); + for (SysIngredentFile file : fileList) { + file.setIgdId(ingredient.getId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(DateUtils.getNowDate()); + } + if (fileList.size() > 0) { + sysIngredientMapper.batchInsertIngredientImage(fileList); + } + } + } + + /** * 修改食材 * @@ -127,10 +139,12 @@ public class SysIngredientServiceImpl implements ISysIngredientService { public int updateSysIngredient(SysIngredient sysIngredient) { sysIngredient.setUpdateTime(DateUtils.getNowDate()); Long ingredientId = sysIngredient.getId(); - sysIngredientMapper.deleteIngredentNotRecByIngredientId(ingredientId); + sysIngredientMapper.deleteIngredientNotRecByIngredientId(ingredientId); insertNotRecommand(sysIngredient); - sysIngredientMapper.deleteIngredentRecByIngredientId(ingredientId); + sysIngredientMapper.deleteIngredientRecByIngredientId(ingredientId); insertRecommand(sysIngredient); + sysIngredientMapper.deleteIngredientImageById(ingredientId); + insertImageFiles(sysIngredient); return sysIngredientMapper.updateSysIngredient(sysIngredient); } @@ -142,8 +156,8 @@ public class SysIngredientServiceImpl implements ISysIngredientService { */ @Override public int deleteSysIngredientByIds(Long[] ids) { - sysIngredientMapper.deleteIngredentRecByIngredientIds(ids); - sysIngredientMapper.deleteIngredentNotRecByIngredientIds(ids); + sysIngredientMapper.deleteIngredientRecByIngredientIds(ids); + sysIngredientMapper.deleteIngredientNotRecByIngredientIds(ids); return sysIngredientMapper.deleteSysIngredientByIds(ids); } @@ -155,8 +169,8 @@ public class SysIngredientServiceImpl implements ISysIngredientService { */ @Override public int deleteSysIngredientById(Long id) { - sysIngredientMapper.deleteIngredentRecByIngredientId(id); - sysIngredientMapper.deleteIngredentNotRecByIngredientId(id); + sysIngredientMapper.deleteIngredientRecByIngredientId(id); + sysIngredientMapper.deleteIngredientNotRecByIngredientId(id); return sysIngredientMapper.deleteSysIngredientById(id); } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml index 261bfbe58..e1b867059 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysIngredientMapper.xml @@ -159,22 +159,22 @@ - + delete from sys_ingredient_rec where ingredient_id=#{ingredientId} - + delete from sys_ingredient_not_rec where ingredient_id=#{ingredientId} - + delete from sys_ingredient_rec where ingredient_id in #{id} - + delete from sys_ingredient_not_rec where ingredient_id in #{id} @@ -239,7 +239,7 @@ - - update sys_ingredent_file set del_flag=1 where id=#{id} - + + delete from sys_ingredient_file where igd_id=#{id} + \ No newline at end of file From ba372bee2660507964165e7f274175b11d93a002 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 17 Mar 2021 14:39:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Doss=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysIngredientServiceImpl.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java index d9adb3f08..e785c9022 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java @@ -3,6 +3,7 @@ package com.stdiet.custom.service.impl; import com.stdiet.common.utils.DateUtils; import com.stdiet.common.utils.SecurityUtils; import com.stdiet.common.utils.StringUtils; +import com.stdiet.common.utils.oss.AliyunOSSUtils; import com.stdiet.custom.domain.SysIngredentFile; import com.stdiet.custom.domain.SysIngredient; import com.stdiet.custom.domain.SysIngredientNotRec; @@ -34,7 +35,16 @@ public class SysIngredientServiceImpl implements ISysIngredientService { */ @Override public SysIngredient selectSysIngredientById(Long id) { - return sysIngredientMapper.selectSysIngredientById(id); + SysIngredient ingredient = sysIngredientMapper.selectSysIngredientById(id); + if (StringUtils.isNotNull(ingredient)) { + List imgList = ingredient.getImgList(); + if (StringUtils.isNotEmpty(imgList)) { + for (SysIngredentFile file : imgList) { + file.setUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl())); + } + } + } + return ingredient; } /** @@ -45,7 +55,18 @@ public class SysIngredientServiceImpl implements ISysIngredientService { */ @Override public List selectSysIngredientList(SysIngredient sysIngredient) { - return sysIngredientMapper.selectSysIngredientList(sysIngredient); + List ingredients = sysIngredientMapper.selectSysIngredientList(sysIngredient); + if (StringUtils.isNotEmpty(ingredients)) { + for (SysIngredient ingredient : ingredients) { + List imgList = ingredient.getImgList(); + if (StringUtils.isNotEmpty(imgList)) { + for (SysIngredentFile file : imgList) { + file.setUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl())); + } + } + } + } + return ingredients; } /** From b36cef2948c3b166643b5fc45c9f03082e22b2e7 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 17 Mar 2021 17:17:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=83=AD=E9=87=8F?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stdiet-ui/public/index.html | 1 + stdiet-ui/src/store/modules/recipes.js | 12 +- .../InfoView/EnergyPieChart/index.vue | 171 ++++++++++++++++ .../recipesBuild/InfoView/PieChart/index.vue | 182 +++++++++++++++--- 4 files changed, 336 insertions(+), 30 deletions(-) create mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/EnergyPieChart/index.vue diff --git a/stdiet-ui/public/index.html b/stdiet-ui/public/index.html index 6d64bf957..34b70ae6f 100644 --- a/stdiet-ui/public/index.html +++ b/stdiet-ui/public/index.html @@ -6,6 +6,7 @@ + <%= webpackConfig.name %> diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue index 6444d1e80..265002f95 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue @@ -3,8 +3,25 @@ :class="`aspect_pie_chart_wrapper ${className || ''}`" :style="{ height: height, width: width }" > -
-
+
+
+ + + + + + +
+
-
- 查看全部 -
+ 查看全部
@@ -76,10 +88,19 @@ export default { f: "脂肪", c: "碳水", }, + menuDict: { + 1: "早餐", + 2: "早加餐", + 3: "午餐", + 4: "午加餐", + 5: "晚餐", + 6: "晚加餐", + }, typeDict: { Weight: "摄入量", Rate: "供能比", }, + view: 1, }; }, computed: { @@ -119,16 +140,17 @@ export default { methods: { initChart() { this.chart = echarts.init(this.$refs.echart, "myShine"); - this.updateChart(this.data.length > 0 ? this.data[0] : {}); + this.updateChart(this.data[0] || {}); }, backToAll() { this.resetCurrentDay({ currentDay: -1 }); }, updateChart(data) { + // console.log(data); this.chart.clear(); - this.chart.setOption({ + const option = { title: { - text: "营养分析", + text: !this.view ? "营养分析" : "热量分析", subtext: data.name, }, tooltip: { @@ -142,26 +164,90 @@ export default { percent, data: { value, oriData, dim }, } = params; - return [ - `${marker} ${name}`, - `摄入量：${oriData[`${dim}Weight`].toFixed(1)}克`, - `摄入热量：${value.toFixed(1)}千卡`, - `供能比：${percent}%`, - ].join("
"); + return !this.view + ? [ + `${marker} ${name}`, + `摄入量：${oriData[`${dim}Weight`].toFixed(1)}克`, + `摄入热量：${value.toFixed(1)}千卡`, + `供能比：${percent}%`, + ] + : [ + `${marker} ${name}`, + `热量：${data[`heat${dim}`].toFixed(1)}千卡`, + `供能比：${percent}%`, + ].join("
"); }, }, + graphic: + this.view === 1 + ? [ + { + type: "group", + top: 60, + left: 10, + silent: true, + children: [ + { + type: "text", + style: { + text: "总热量", + fill: "#606266", + }, + }, + { + type: "text", + top: 18, + left: 8, + style: { + text: `${this.totalHeat.toFixed(1)}千卡`, + font: '14px "Microsoft YaHei", sans-serif', + }, + }, + ], + }, + { + type: "group", + top: 36, + right: 10, + silent: true, + children: Object.keys(this.menuDict).reduce((arr, cur) => { + const tarData = data[`heat${cur}`]; + if (tarData) { + arr.push({ + type: "text", + top: arr.length * 20, + right: 10, + style: { + text: `${this.menuDict[cur]}：${tarData.toFixed(1)}`, + fill: "#606266", + }, + }); + } + return arr; + }, []), + }, + ] + : [], series: [ { name: data.name, type: "pie", - radius: [0, 40], + radius: [0, !this.view ? 40 : 60], center: ["50%", "55%"], - data: ["p", "f", "c"].map((dim) => ({ - dim, - value: data[`${dim}Heat`], - name: this.nameDict[dim], - oriData: data, - })), + data: (!this.view + ? Object.keys(this.nameDict) + : Object.keys(this.menuDict) + ).reduce((arr, dim) => { + if (!this.view || data[`heat${dim}`]) { + arr.push({ + dim, + value: !this.view ? data[`${dim}Heat`] : data[`heat${dim}`], + name: (!this.view ? this.nameDict : this.menuDict)[dim], + oriData: data, + }); + } + return arr; + }, []), // labelLine: { // length: 5, // length2: 5, @@ -170,7 +256,7 @@ export default { show: true, position: "inside", color: "#fff", - fontSize: 10, + fontSize: !this.view ? 10 : 12, fontWeight: "bold", }, itemStyle: { @@ -179,7 +265,16 @@ export default { }, }, ], + }; + console.log(option); + this.chart.setOption(option); + }, + handleOnViewChange(view) { + this.view = view; + this.chart.resize({ + width: !this.view ? 100 : 364, }); + this.updateChart(this.data[0] || {}); }, ...mapMutations(["resetCurrentDay"]), }, @@ -195,21 +290,24 @@ export default { }; From 9d9701f23547290e9a8f7f1aebb0f135644ddb49 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 17 Mar 2021 17:24:49 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InfoView/EnergyPieChart/index.vue | 171 ------------------ .../recipesBuild/InfoView/PieChart/index.vue | 6 +- .../RecipesView/RecipesCom/index.vue | 9 +- 3 files changed, 4 insertions(+), 182 deletions(-) delete mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/EnergyPieChart/index.vue diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/EnergyPieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/EnergyPieChart/index.vue deleted file mode 100644 index 9ac8c7b38..000000000 --- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/EnergyPieChart/index.vue +++ /dev/null @@ -1,171 +0,0 @@ - - - - diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue index 265002f95..21ee2714e 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue @@ -100,7 +100,7 @@ export default { Weight: "摄入量", Rate: "供能比", }, - view: 1, + view: 0, }; }, computed: { @@ -190,7 +190,7 @@ export default { { type: "text", style: { - text: "总热量", + text: "总热量约", fill: "#606266", }, }, @@ -324,7 +324,7 @@ export default { .see_all { position: absolute; bottom: 4px; - left: 4px; + left: 24px; padding: 0; } diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue index bb57c4067..359613a1b 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue @@ -49,14 +49,7 @@