菜单页面调整。库位页面调整。登录页面增加语言切换。

src/main/java/com/neotel/smfcore/core/language/rest/LanguageSetController.java

@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.language.service.bean.LanguageInfo;
 import com.neotel.smfcore.core.language.service.bean.LanguageInfo;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.rest.bean.dto.UserDto;
 import com.neotel.smfcore.security.rest.bean.dto.UserDto;
 import com.neotel.smfcore.security.service.po.User;
 import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -47,7 +48,8 @@ public class LanguageSetController {
 
 
     @ApiOperation("获取语言列表")
     @ApiOperation("获取语言列表")
     @GetMapping
     @GetMapping
-    @PreAuthorize("@el.check('translation')")
+    @AnonymousAccess
+//    @PreAuthorize("@el.check('translation')")
     public List<LanguageInfo> getList(){
     public List<LanguageInfo> getList(){
         return getAllLanList();
         return getAllLanList();
     }
     }

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -239,8 +239,13 @@ public class StoragePosController {
         pos.setPriority(saveDto.getPriority());
         pos.setPriority(saveDto.getPriority());
         pos.setH(saveDto.getH());
         pos.setH(saveDto.getH());
         pos.setW(saveDto.getW());
         pos.setW(saveDto.getW());
+        String enabledStr="";
+        if(pos.isEnabled()!= saveDto.isEnabled()){
+            pos.setEnabled(saveDto.isEnabled());
+            enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位";
+        }
         storagePosManager.save(pos);
         storagePosManager.save(pos);
-        log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]");
+        log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]"+enabledStr);
         return new ResponseEntity<>(HttpStatus.OK);
         return new ResponseEntity<>(HttpStatus.OK);
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/storage/rest/dto/StoragePosSaveDto.java

@@ -24,4 +24,7 @@ public class StoragePosSaveDto implements Serializable {
 
 
     @ApiModelProperty("宽度")
     @ApiModelProperty("宽度")
     private int w;
     private int w;
+
+    @ApiModelProperty("是否可用,true=可用，false=禁用")
+    private boolean enabled = true;
 }
 }

src/main/java/com/neotel/smfcore/security/rest/MenuController.java

@@ -125,10 +125,19 @@ public class MenuController {
     @GetMapping
     @GetMapping
     @ApiOperation("查询菜单")
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
     @PreAuthorize("@el.check('menu:list')")
-    public PageData<MenuDto> query(MenuQueryCondition criteria) throws Exception {
+    public PageData<MenuDto> query(MenuQueryCondition criteria,HttpServletRequest servletRequest) throws Exception {
+        Locale locale=servletRequest.getLocale();
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         query.addCriteria(Criteria.where("type").ne(2));
         query.addCriteria(Criteria.where("type").ne(2));
-        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.findByQuery(query));
+        List<Menu> menuList=menuManager.findByQuery(query);
+        for (int i=0;i<menuList.size();i++){
+            String oldName=ObjectUtil.isNotEmpty(menuList.get(i).getComponentName())?menuList.get(i).getComponentName():menuList.get(i).getTitle();
+            String titleKey=menuList.get(i).getTitleKey();
+            String title= MessageUtils.getText(menuList.get(i).GetMsgKey(), locale,oldName);
+            menuList.get(i).setTitle(title);
+        }
+        List<MenuDto> menuDtoList = menuMapper.toDto(menuList);
+
         return new PageData(menuDtoList, menuDtoList.size());
         return new PageData(menuDtoList, menuDtoList.size());
     }
     }
 
 
@@ -152,8 +161,8 @@ public class MenuController {
     @PostMapping
     @PostMapping
     @PreAuthorize("@el.check('menu:add')")
     @PreAuthorize("@el.check('menu:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody MenuDto menuDto) {
     public ResponseEntity<Object> create(@Validated @RequestBody MenuDto menuDto) {
-        Menu resources=menuMapper.toEntity(menuDto);
-        menuManager.saveMenu(resources);
+//        Menu resources=menuMapper.toEntity(menuDto);
+//        menuManager.saveMenu(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
     }
 
 
@@ -175,16 +184,16 @@ public class MenuController {
     @DeleteMapping
     @DeleteMapping
     @PreAuthorize("@el.check('menu:del')")
     @PreAuthorize("@el.check('menu:del')")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        if(!SecurityUtils.getCurrentUsername().equals(Constants.SUPER_USERNAME)){
-            throw new ValidateException("smfcore.noAccessUpdate","没有删除菜单的权限");
-        }
-        Set<Menu> menuSet = new HashSet<>();
-        for (String id : ids) {
-            List<Menu> menuList = menuManager.getMenusByPid(id);
-            menuSet.add(menuManager.get(id));
-            menuSet = menuManager.getChildMenus(menuList, menuSet);
-        }
-        menuManager.delete(menuSet);
+//        if(!SecurityUtils.getCurrentUsername().equals(Constants.SUPER_USERNAME)){
+//            throw new ValidateException("smfcore.noAccessUpdate","没有删除菜单的权限");
+//        }
+//        Set<Menu> menuSet = new HashSet<>();
+//        for (String id : ids) {
+//            List<Menu> menuList = menuManager.getMenusByPid(id);
+//            menuSet.add(menuManager.get(id));
+//            menuSet = menuManager.getChildMenus(menuList, menuSet);
+//        }
+//        menuManager.delete(menuSet);
 
 
         return new ResponseEntity<>(HttpStatus.OK);
         return new ResponseEntity<>(HttpStatus.OK);
     }
     }

修改记录.txt

@@ -10,3 +10,10 @@
 /service/store/uploadStoragePos
 /service/store/uploadStoragePos
 客户端上传料仓库位列表，参数：cid，posList （库位列表）
 客户端上传料仓库位列表，参数：cid，posList （库位列表）
 处理：判断料仓是否存在，不存在时自动创建料仓。料仓无库位时自动上传库位，有库位时不处理。
 处理：判断料仓是否存在，不存在时自动创建料仓。料仓无库位时自动上传库位，有库位时不处理。
+
+
+20220228：
+1.菜单页面调整。
+2.库位页面调整。
+3.登录页面增加语言切换。
+4.共享文件夹页面调整。