20220426

xiaoyong931011

2022-04-27 64a10b002ca608883465990ed6fc255e031a3774

20220426

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java

@@ -1,8 +1,13 @@
package com.matrix.system.padApi.action;

import cn.hutool.core.collection.CollUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.RSAUtils;
import com.matrix.core.tools.UUIDUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
@@ -11,10 +16,22 @@
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.init.LocalCache;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.SysBedInfoService;
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.hive.service.SysShopInfoService;
import com.matrix.system.hive.service.SysWorktimeService;
import com.matrix.system.padApi.dto.PadOrderListDto;
import com.matrix.system.padApi.dto.WebPadLoginDto;
import com.matrix.system.padApi.vo.PadOrderDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -24,11 +41,16 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@CrossOrigin(origins = "*")
@Api(value = "PadApiCommonAction", tags = "pad端公共请求类(含登陆)")
@RestController
@RequestMapping(value = "/api/common/pad")
public class PadApiCommonAction {
public class PadApiCommonAction extends BaseController {

    @Autowired
    private SysUsersService sysUsersService;
@@ -44,6 +66,15 @@

    @Autowired
    private SysShopInfoService sysShopInfoService;

    @Resource
    private SysOrderService sysOrderService;

    @Resource
    private SysBedInfoService bedInfoService;

    @Resource
    private SysWorktimeService sysWorkTimeService;

    @Value("${login_public_key}")
    private String publicKey;
@@ -86,6 +117,70 @@
        return result;
    }


    @Resource
    private SysUsersService usersService;

    @ApiOperation(value = "首页", notes = "首页")
    @GetMapping(value = "/frist")
    public AjaxResult frist() {
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        PadOrderListDto orderListDto = new PadOrderListDto();
        orderListDto.setPageNum(1);
        orderListDto.setPageSize(5);
        int offset = (orderListDto.getPageNum() - 1) * orderListDto.getPageSize();
        int limit = orderListDto.getPageSize();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);
        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
        }
        QueryUtil.setQueryLimitCom(orderListDto);
        List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);

        AjaxResult result = AjaxResult.buildSuccessInstance("");
        result.putInMap("orderList",padApiOrderListInPage);

        List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
        if(CollUtil.isNotEmpty(mls)){
            SysBeauticianState sysBeauticianState = new SysBeauticianState();
            Date date = new Date();
            sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
            sysBeauticianState.setEndTime(DateUtil.getStartDate(date));
            String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
            List<SysUsers> staffs=new ArrayList<>();
            if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){
                staffs= sysUsersService.findByCodeBeaStateShop(user.getShopId(),
                        sysBeauticianState, panBanCodes);
                if(CollUtil.isNotEmpty(staffs)){
                    result.putInMap("usedMls", mls.size() - staffs.size());
                    result.putInMap("freeMls", staffs.size());
                }else{
                    result.putInMap("usedMls", mls.size());
                    result.putInMap("freeMls", 0);
                }
            }
        }

        SysBedInfo bedInfo = new SysBedInfo();
        bedInfo.setShopId(getMe().getShopId());
        List<SysBedInfo> totalBed = bedInfoService.findByModel(bedInfo);
        if(CollUtil.isNotEmpty(totalBed)){
            SysProjServices sysProjServices = new SysProjServices();
            sysProjServices.setShopId(getMe().getShopId());
            List<SysBedInfo> freeBed = bedInfoService.findFreeBed(sysProjServices);
            if(CollUtil.isNotEmpty(freeBed)){
                result.putInMap("usedBed", totalBed.size() - freeBed.size());
                result.putInMap("freeBed", freeBed);
            }else{
                result.putInMap("usedBed", totalBed);
                result.putInMap("freeBed", 0);
            }
        }
        return result;
    }

    @ApiOperation(value = "用户退出系统", notes = "用户退出系统")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = AjaxResult.class)

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadKucunAction.java

New file
@@ -0,0 +1,83 @@
package com.matrix.system.padApi.action;

import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.bean.SysGoodsType;
import com.matrix.system.hive.bean.SysStoreInfo;
import com.matrix.system.hive.dao.SysStoreInfoDao;
import com.matrix.system.hive.service.SysGoodsTypeService;
import com.matrix.system.padApi.dto.PadKucunListDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

@CrossOrigin(origins = "*")
@Api(value = "PadKucunAction", tags = "pad端库存请求")
@RestController
@RequestMapping(value = "/api/pad/kucun")
public class PadKucunAction extends BaseController {

    @Resource
    private SysGoodsTypeService currentService;

    @Resource
    private SysStoreInfoDao sysStoreInfoDao;

    @ApiOperation(value = "显示所有分类列表", notes = "显示所有分类列表")
    @PostMapping(value = "/all")
    public AjaxResult all() {
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        SysGoodsType sysGoodsType = new SysGoodsType();
        sysGoodsType.setCompanyId(users.getCompanyId());
        List<SysGoodsType> list=currentService.findByModel(sysGoodsType);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS,    currentService.findByModel(sysGoodsType), 0);
    }



    @ApiOperation(value = "显示库存列表", notes = "显示库存列表")
    @PostMapping(value = "/showCountList")
    public AjaxResult showCountList(@RequestBody @Validated PadKucunListDto padKucunListDto) {
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        SysStoreInfo sysStoreInfo = new SysStoreInfo();
        sysStoreInfo.setShopId(users.getShopId());
        sysStoreInfo.setCompanyId(users.getCompanyId());

        int offset = (padKucunListDto.getPageNum() - 1) * padKucunListDto.getPageSize();
        int limit = padKucunListDto.getPageSize();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);

        if(StrUtil.isNotEmpty(padKucunListDto.getQueryKey())){
            sysStoreInfo.setQueryKey(padKucunListDto.getQueryKey());
        }
        if(ObjectUtil.isNotEmpty(padKucunListDto.getGoodsSortId())){
            ShoppingGoods shoppingGoods = new ShoppingGoods();
            shoppingGoods.setGoodsSortId(padKucunListDto.getGoodsSortId());
            sysStoreInfo.setGoods(shoppingGoods);
        }

        if (!DataAuthUtil.hasAllShopAuth()) {
            padKucunListDto.setShopId(users.getShopId());
        }
        QueryUtil.setQueryLimitCom(padKucunListDto);

        List<SysStoreInfo> dataList = sysStoreInfoDao.selectCountInPage(sysStoreInfo, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS,  dataList, sysStoreInfoDao.selectCountTotalRecord(sysStoreInfo));
        return result;
    }
}

 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadKucunListDto.java

New file
@@ -0,0 +1,23 @@
package com.matrix.system.padApi.dto;

import com.matrix.system.app.dto.BasePageDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@ApiModel(value = "PadKucunListDto", description = "库存列表接收参数类")
@Data
public class PadKucunListDto extends BasePageDto {
    @ApiModelProperty(value = "库存分类ID", example = "")
    private Long goodsSortId;

    @ApiModelProperty(value = "查询字段")
    private String queryKey;

    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;
}