增加图片验证码和登录日志 权限管理优化

石广澎

2024-01-02 0cd1631ceaa93e6483908fd692d2cb693b85324b

 consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java

@@ -18,7 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
@@ -192,7 +192,7 @@
        CommonUtil.copyProperties(goodsTemplate, param2);
        goodsTemplate = param2;

        if (goodsTemplate == null || goodsTemplate.getId() == null || goodsTemplate.getStates() == null) {
        if (goodsTemplate.getId() == null || goodsTemplate.getStates() == null) {
            return ResponseValue.error("参数错误");
        }

@@ -269,7 +269,8 @@
        Map<String, Object> map = new HashMap<>();
        map.put("categoryId", categoryId);

        List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, (short)1);
        List<BaseWarehouse> baseWarehouseList =
            baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue());
        if (CollectionUtils.isEmpty(baseWarehouseList)) {
            return ResponseValue.error("机构无仓库！");

@@ -296,14 +297,14 @@
    @PostMapping("/import")
    public ResponseValue upload(MultipartFile file) throws IOException {
        String originalFilename = file.getOriginalFilename();
        if (!originalFilename.endsWith(".xls")) {
        if (!".xls".endsWith(originalFilename)) {
            return ResponseValue.error("文件格式有误!");
        }
        FinSysTenantUser sysInfo = this.getSysInfo();
        if (sysInfo == null) {
            return ResponseValue.error("当前登录用户为空");
        }
        EasyExcel.read(file.getInputStream(), ImportGoodsInfoTemplate.class,
        EasyExcelFactory.read(file.getInputStream(), ImportGoodsInfoTemplate.class,
            new AnalysisEventListener<ImportGoodsInfoTemplate>() {
                List<BaseGoodsTemplateParam> list = Lists.newArrayList();