存储tabbar图标

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/add.html

@@ -20,8 +20,8 @@
                 <select name="pagePath" class="form-control">
                     <option value="pages/index/index">首页</option>
                     <option value="pages/scan/scan">扫一扫</option>
-                    <option value="pages/knowledge/knowledge">我的</option>
+                    <option value="pages/my/my">我的</option>
-                    <option value="pages/my/my">动态</option>
+                    <option value="pages/knowledge/knowledge">动态</option>
                 </select>
             </div>
         </div>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/tab/edit.html

@@ -20,8 +20,8 @@
                     <select name="pagePath" class="form-control" th:field="*{pagePath}">
                         <option value="pages/index/index">首页</option>
                         <option value="pages/scan/scan">扫一扫</option>
-                        <option value="pages/knowledge/knowledge">我的</option>
+                        <option value="pages/my/my">我的</option>
-                        <option value="pages/my/my">动态</option>
+                        <option value="pages/knowledge/knowledge">动态</option>
                     </select>
                 </div>
             </div>

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneTabController.java

@@ -95,8 +95,7 @@ public class SceneTabController extends BaseController {
     @PostMapping("/add")
     @ResponseBody
     public ZDResponse addSave(@RequestParam("file") MultipartFile[] files, SceneTab sceneTab) {
-        return sceneTabService.insertSceneTab(files, sceneTab) > 0
+        return sceneTabService.insertSceneTab(files, sceneTab);
-                ? ZDResponse.success() : ZDResponse.error("新增失败");
     }
 
     /**
@@ -126,8 +125,7 @@ public class SceneTabController extends BaseController {
     @PostMapping("/selected")
     @ResponseBody
     public ZDResponse selectedSave(@RequestParam("file") MultipartFile[] files, SceneTab sceneTab) {
-        return sceneTabService.selected(files, sceneTab) > 0
+        return sceneTabService.selected(files, sceneTab);
-                ? ZDResponse.success() : ZDResponse.error("编辑失败");
     }
 
     /**
@@ -137,8 +135,7 @@ public class SceneTabController extends BaseController {
     @PostMapping("/edit")
     @ResponseBody
     public ZDResponse editSave(@RequestParam("file") MultipartFile[] files, SceneTab sceneTab) {
-        return sceneTabService.updateSceneTab(files, sceneTab) > 0
+        return sceneTabService.updateSceneTab(files, sceneTab);
-                ? ZDResponse.success() : ZDResponse.error("编辑失败");
     }
 
     /**

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneTabService.java

@@ -38,7 +38,7 @@ public interface ISceneTabService {
      * @param sceneTab
      * @return 结果
      */
-    public int insertSceneTab(MultipartFile[] files, SceneTab sceneTab);
+    public ZDResponse insertSceneTab(MultipartFile[] files, SceneTab sceneTab);
 
     /**
      * 选中
@@ -46,7 +46,7 @@ public interface ISceneTabService {
      * @param sceneTab
      * @return 结果
      */
-    public int selected(MultipartFile[] files, SceneTab sceneTab);
+    public ZDResponse selected(MultipartFile[] files, SceneTab sceneTab);
 
     /**
      * 修改
@@ -54,7 +54,7 @@ public interface ISceneTabService {
      * @param sceneTab
      * @return 结果
      */
-    public int updateSceneTab(MultipartFile[] files, SceneTab sceneTab);
+    public ZDResponse updateSceneTab(MultipartFile[] files, SceneTab sceneTab);
 
     /**
      * 批量删除

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneTabServiceImpl.java

@@ -85,7 +85,12 @@ public class SceneTabServiceImpl implements ISceneTabService {
      * @return 结果
      */
     @Override
-    public int insertSceneTab(MultipartFile[] files, SceneTab sceneTab) {
+    public ZDResponse insertSceneTab(MultipartFile[] files, SceneTab sceneTab) {
+        if (ObjectUtil.isEmpty(files) || files.length > 1) {
+            return ZDResponse.error("文件不能为空且只允许上传一张图片");
+        }
+        String uploadPath = fileUploadApi.upload(files[0]);
+        zdxtFileCommonApi.insertZdxtFile(files[0], sceneTab.getGuid() + "", uploadPath);
         UserBean userBean = userApi.getCurrentUser();
         if (Objects.nonNull(userBean)) {
             sceneTab.setCreator(userBean.getUserName());
@@ -95,14 +100,14 @@ public class SceneTabServiceImpl implements ISceneTabService {
         if (!StringUtils.isEmpty(sceneTab.getPagePath())) {
             sceneTab.setType(TYPE_TAB.get(sceneTab.getPagePath()));
         }
+        sceneTab.setIconPath(uploadPath);
         int result = sceneTabMapper.insertSceneTab(sceneTab);
         // 上传文件，并在附件表中添加记录
-        if (result > 0 && ObjectUtil.isNotEmpty(files)) {
+        if (result > 0) {
-            for (MultipartFile file : files) {
+            zdxtFileCommonApi.insertZdxtFile(files[0], sceneTab.getGuid() + "", uploadPath);
-                zdxtFileCommonApi.insertZdxtFile(file, sceneTab.getGuid() + "", fileUploadApi.upload(file));
+            return ZDResponse.success();
-            }
         }
-        return result;
+        return ZDResponse.error("新增失败");
     }
 
     /**
@@ -112,16 +117,20 @@ public class SceneTabServiceImpl implements ISceneTabService {
      * @return 结果
      */
     @Override
-    public int selected(MultipartFile[] files, SceneTab sceneTab) {
+    public ZDResponse selected(MultipartFile[] files, SceneTab sceneTab) {
-        int result = 0;
+        if (ObjectUtil.isEmpty(files) || files.length > 1) {
+            return ZDResponse.error("文件不能为空且只允许上传一张图片");
+        }
+        String uploadPath = fileUploadApi.upload(files[0]);
+        sceneTab.setSelectedIconPath(uploadPath);
+        int result = sceneTabMapper.updateSceneTab(sceneTab);
         // 上传文件，并在附件表中添加记录
-        if (ObjectUtil.isNotEmpty(files)) {
+        if (result > 0) {
             zdxtFileCommonApi.deleteZdxtFileByIds(sceneTab.getGuid() + "0000");
-            for (MultipartFile file : files) {
+            zdxtFileCommonApi.insertZdxtFile(files[0], sceneTab.getGuid() + "0000", uploadPath);
-                result = zdxtFileCommonApi.insertZdxtFile(file, sceneTab.getGuid() + "0000", fileUploadApi.upload(file));
+            return ZDResponse.success();
-            }
         }
-        return result;
+        return ZDResponse.error("编辑选中图片失败");
     }
 
     /**
@@ -131,16 +140,20 @@ public class SceneTabServiceImpl implements ISceneTabService {
      * @return 结果
      */
     @Override
-    public int updateSceneTab(MultipartFile[] files, SceneTab sceneTab) {
+    public ZDResponse updateSceneTab(MultipartFile[] files, SceneTab sceneTab) {
+        if (ObjectUtil.isEmpty(files) || files.length > 1) {
+            return ZDResponse.error("文件不能为空且只允许上传一张图片");
+        }
+        String uploadPath = fileUploadApi.upload(files[0]);
+        sceneTab.setIconPath(uploadPath);
         int result = sceneTabMapper.updateSceneTab(sceneTab);
         // 上传文件，并在附件表中添加记录
-        if (result > 0 && ObjectUtil.isNotEmpty(files)) {
+        if (result > 0) {
             zdxtFileCommonApi.deleteZdxtFileByIds(sceneTab.getGuid());
-            for (MultipartFile file : files) {
+            zdxtFileCommonApi.insertZdxtFile(files[0], sceneTab.getGuid() + "", uploadPath);
-                zdxtFileCommonApi.insertZdxtFile(file, sceneTab.getGuid() + "", fileUploadApi.upload(file));
+            return ZDResponse.success();
-            }
         }
-        return result;
+        return ZDResponse.error("编辑失败");
     }
 
     /**

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java

@@ -114,7 +114,7 @@ public class WechatServiceImpl implements WechatService {
 
     @Override
     public ZDResponse showMyMedal(WechatUser wechatUser) {
-        WechatUser user = wechatLoginMapper.getByOpenId(wechatUser.getOpenId());
+        WechatUser user = wechatLoginMapper.selectUserById(wechatUser.getGuid());
         if (Objects.nonNull(user.getMedal())) {
             List<SceneMedal> sceneMedals = sceneMedalMapper.selectSceneMedalByIds(Convert.toStrArray(user.getMedal()));
             return ZDResponse.success("成功", sceneMedals);