初始化
This commit is contained in:
parent
f59878ef23
commit
70e3cf2937
|
|
@ -115,7 +115,7 @@ public class DictionaryController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("getDictionaryItemTranslateList")
|
@GetMapping("getDictionaryItemTranslateList")
|
||||||
@ApiMark(moduleName = "字典管理", apiName = "获取字典值翻译列表")
|
@ApiMark(moduleName = "字典管理", apiName = "获取字典值翻译列表")
|
||||||
public ApiResult<List<DictionaryItemTranslateVO>> getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Integer id) {
|
public ApiResult<List<DictionaryItemTranslateVO>> getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Long id) {
|
||||||
return ApiResult.success(dictionaryControllerService.getDictionaryItemTranslateList(id));
|
return ApiResult.success(dictionaryControllerService.getDictionaryItemTranslateList(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ public class MenuController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("deleteMenu")
|
@PostMapping("deleteMenu")
|
||||||
@ApiMark(moduleName = "菜单管理", apiName = "删除菜单")
|
@ApiMark(moduleName = "菜单管理", apiName = "删除菜单")
|
||||||
public ApiResult<Void> deleteMenu(@Valid @RequestBody List<Integer> ids) {
|
public ApiResult<Void> deleteMenu(@Valid @RequestBody List<Long> ids) {
|
||||||
menuControllerService.delete(ids);
|
menuControllerService.delete(ids);
|
||||||
return ApiResult.success();
|
return ApiResult.success();
|
||||||
}
|
}
|
||||||
|
|
@ -126,7 +126,7 @@ public class MenuController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("deleteMenuButton")
|
@PostMapping("deleteMenuButton")
|
||||||
@ApiMark(moduleName = "菜单管理", apiName = "删除菜单按钮")
|
@ApiMark(moduleName = "菜单管理", apiName = "删除菜单按钮")
|
||||||
public ApiResult<Void> deleteMenuButton(@Valid @RequestBody List<Integer> ids) {
|
public ApiResult<Void> deleteMenuButton(@Valid @RequestBody List<Long> ids) {
|
||||||
menuControllerService.deleteMenuButton(ids);
|
menuControllerService.deleteMenuButton(ids);
|
||||||
return ApiResult.success();
|
return ApiResult.success();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ public class MultilingualController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("/deleteWebComponent")
|
@PostMapping("/deleteWebComponent")
|
||||||
@ApiMark(moduleName = "多语言管理", apiName = "删除网页组件")
|
@ApiMark(moduleName = "多语言管理", apiName = "删除网页组件")
|
||||||
public ApiResult<Void> deleteWebComponent(@Valid @RequestBody @NotEmpty List<Integer> ids) {
|
public ApiResult<Void> deleteWebComponent(@Valid @RequestBody @NotEmpty List<Long> ids) {
|
||||||
multilingualControllerService.deleteWebComponent(ids);
|
multilingualControllerService.deleteWebComponent(ids);
|
||||||
return ApiResult.success();
|
return ApiResult.success();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ public class SupplierController extends BaseController {
|
||||||
* @param ids 选中的id集合
|
* @param ids 选中的id集合
|
||||||
*/
|
*/
|
||||||
@PostMapping("export")
|
@PostMapping("export")
|
||||||
public void exportSelect(HttpServletResponse response,@Valid @RequestBody @NotEmpty List<Integer> ids) throws Exception {
|
public void exportSelect(HttpServletResponse response,@Valid @RequestBody @NotEmpty List<Long> ids) throws Exception {
|
||||||
userControllerService.exportSupplier(response,ids);
|
userControllerService.exportSupplier(response,ids);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ public class DictionaryControllerService {
|
||||||
* @param id 字典值id
|
* @param id 字典值id
|
||||||
* @return 字典值翻译列表
|
* @return 字典值翻译列表
|
||||||
*/
|
*/
|
||||||
public List<DictionaryItemTranslateVO> getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Integer id) {
|
public List<DictionaryItemTranslateVO> getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Long id) {
|
||||||
return dictionaryItemTranslateService.getListByDictionaryItemId(id);
|
return dictionaryItemTranslateService.getListByDictionaryItemId(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ import com.nflg.wms.common.pojo.vo.ApiVO;
|
||||||
import com.nflg.wms.common.pojo.vo.MenuAuthorizeVO;
|
import com.nflg.wms.common.pojo.vo.MenuAuthorizeVO;
|
||||||
import com.nflg.wms.common.pojo.vo.MenuButtonVO;
|
import com.nflg.wms.common.pojo.vo.MenuButtonVO;
|
||||||
import com.nflg.wms.common.pojo.vo.MenuVO;
|
import com.nflg.wms.common.pojo.vo.MenuVO;
|
||||||
import com.nflg.wms.common.util.VUtil;
|
|
||||||
import com.nflg.wms.repository.entity.DictionaryItem;
|
import com.nflg.wms.repository.entity.DictionaryItem;
|
||||||
import com.nflg.wms.repository.service.*;
|
import com.nflg.wms.repository.service.*;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
|
|
@ -68,7 +67,7 @@ public class MenuControllerService {
|
||||||
menuService.update(request);
|
menuService.update(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void delete(@Valid List<Integer> ids) {
|
public void delete(@Valid List<Long> ids) {
|
||||||
menuService.delete(ids);
|
menuService.delete(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -92,7 +91,7 @@ public class MenuControllerService {
|
||||||
menuButtonService.enable(request);
|
menuButtonService.enable(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deleteMenuButton(@Valid List<Integer> ids) {
|
public void deleteMenuButton(@Valid List<Long> ids) {
|
||||||
menuButtonService.removeByIds(ids);
|
menuButtonService.removeByIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ public class MultilingualControllerService {
|
||||||
return webComponentService.search(request);
|
return webComponentService.search(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deleteWebComponent(@Valid @NotEmpty List<Integer> ids) {
|
public void deleteWebComponent(@Valid @NotEmpty List<Long> ids) {
|
||||||
webComponentService.removeByIds(ids);
|
webComponentService.removeByIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -484,7 +484,7 @@ public class UserControllerService {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void exportSupplier(HttpServletResponse response, @Valid @NotEmpty List<Integer> ids) throws IOException {
|
public void exportSupplier(HttpServletResponse response, @Valid @NotEmpty List<Long> ids) throws IOException {
|
||||||
List<VUserSupplier> users = vUserSupplierService.listByIds(ids);
|
List<VUserSupplier> users = vUserSupplierService.listByIds(ids);
|
||||||
List<DictionaryItem> suppliersCategory = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SUPPLIERS_CATEGORY);
|
List<DictionaryItem> suppliersCategory = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SUPPLIERS_CATEGORY);
|
||||||
List<SupplierExcelExportDTO> datas = users.stream().map(vu -> {
|
List<SupplierExcelExportDTO> datas = users.stream().map(vu -> {
|
||||||
|
|
|
||||||
|
|
@ -14,5 +14,5 @@ public class ZipDownloadQO {
|
||||||
* 文件id列表
|
* 文件id列表
|
||||||
*/
|
*/
|
||||||
@NotEmpty
|
@NotEmpty
|
||||||
private List<Integer> fileIds;
|
private List<Long> fileIds;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public interface DictionaryItemTranslateMapper extends BaseMapper<DictionaryItemTranslate> {
|
public interface DictionaryItemTranslateMapper extends BaseMapper<DictionaryItemTranslate> {
|
||||||
|
|
||||||
List<DictionaryItemTranslateVO> getListByDictionaryItemId(Integer id);
|
List<DictionaryItemTranslateVO> getListByDictionaryItemId(Long id);
|
||||||
|
|
||||||
List<DictionaryItemTranslateVO> getAllByDictionaryCode(String code, String language);
|
List<DictionaryItemTranslateVO> getAllByDictionaryCode(String code, String language);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public interface IDictionaryItemTranslateService extends IService<DictionaryItemTranslate> {
|
public interface IDictionaryItemTranslateService extends IService<DictionaryItemTranslate> {
|
||||||
|
|
||||||
List<DictionaryItemTranslateVO> getListByDictionaryItemId(Integer id);
|
List<DictionaryItemTranslateVO> getListByDictionaryItemId(Long id);
|
||||||
|
|
||||||
Long getId(Long dictionaryItemId, String code);
|
Long getId(Long dictionaryItemId, String code);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ public interface IMenuService extends IService<Menu> {
|
||||||
|
|
||||||
void update(@Valid MenuUpdateQO request);
|
void update(@Valid MenuUpdateQO request);
|
||||||
|
|
||||||
void delete(@Valid List<Integer> ids);
|
void delete(@Valid List<Long> ids);
|
||||||
|
|
||||||
void enableMenu(@Valid EnableMenuQO request);
|
void enableMenu(@Valid EnableMenuQO request);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ public class DictionaryItemTranslateServiceImpl extends ServiceImpl<DictionaryIt
|
||||||
private ILanguageService languageService;
|
private ILanguageService languageService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DictionaryItemTranslateVO> getListByDictionaryItemId(Integer id) {
|
public List<DictionaryItemTranslateVO> getListByDictionaryItemId(Long id) {
|
||||||
List<DictionaryItemTranslateVO> datas = baseMapper.getListByDictionaryItemId(id);
|
List<DictionaryItemTranslateVO> datas = baseMapper.getListByDictionaryItemId(id);
|
||||||
List<Language> languages = languageService.getLanguages();
|
List<Language> languages = languageService.getLanguages();
|
||||||
languages.forEach(l -> {
|
languages.forEach(l -> {
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void delete(List<Integer> ids) {
|
public void delete(List<Long> ids) {
|
||||||
VUtil.trueThrowBusinessError(lambdaQuery().in(Menu::getParentId, ids).exists()).throwMessage("请先删除下级菜单");
|
VUtil.trueThrowBusinessError(lambdaQuery().in(Menu::getParentId, ids).exists()).throwMessage("请先删除下级菜单");
|
||||||
VUtil.trueThrowBusinessError(menuButtonService.lambdaQuery().in(MenuButton::getMenuId, ids).exists())
|
VUtil.trueThrowBusinessError(menuButtonService.lambdaQuery().in(MenuButton::getMenuId, ids).exists())
|
||||||
.throwMessage("请先删除下级按钮");
|
.throwMessage("请先删除下级按钮");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue