From bf25c80bccec5692e471bf6ae87f991b7782a5d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 十二月 2024 14:38:58 +0800
Subject: [PATCH] 验光师端代码

---
 /dev/null |  361 ---------------------------------------------------
 1 files changed, 0 insertions(+), 361 deletions(-)

diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/SecFeeItemsController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/SecFeeItemsController.java
deleted file mode 100644
index 7b780c7..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/SecFeeItemsController.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.optometrist.dto.SecFeeItemsDTO;
-import com.jilongda.optometrist.model.SecFeeItems;
-import com.jilongda.optometrist.service.SecFeeItemsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 系统设置-收费项设置	 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "收费项设置")
-@RestController
-@RequestMapping("/sec-fee-items")
-public class SecFeeItemsController {
-
-
-    @Autowired
-    private SecFeeItemsService secFeeItemsService;
-
-    /**
-     * 收费项设置
-     */
-    @ApiOperation(value = "收费项设置查询列表")
-    @PostMapping(value = "/list")
-    public ApiResult<List<SecFeeItems>> list() {
-        return ApiResult.success(secFeeItemsService.list());
-    }
-
-    /**
-     * 查询详情
-     */
-    @ApiOperation(value = "收费项设置修改")
-    @PostMapping(value = "/updateList")
-    public ApiResult<String> updateList(@RequestBody SecFeeItemsDTO dto ) {
-        List<SecFeeItems> secFeeItemsList = dto.getSecFeeItemsList();
-        secFeeItemsService.saveOrUpdateBatch(secFeeItemsList);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "收费项设置启用禁用")
-    @GetMapping(value = "/upAndDown")
-    public ApiResult<Boolean> upAndDown(@RequestParam Long id,
-                                        @RequestParam Integer status) {
-        return ApiResult.success(secFeeItemsService.upAndDown(id,status));
-    }
-
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/SecSettingController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/SecSettingController.java
deleted file mode 100644
index 3b090aa..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/SecSettingController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.optometrist.model.SecSetting;
-import com.jilongda.optometrist.model.TFrameWarehousingDetail;
-import com.jilongda.optometrist.model.TWarehousing;
-import com.jilongda.optometrist.service.SecSettingService;
-import com.jilongda.optometrist.vo.TWarehousingVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- * 系统设置	 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "低库存警告")
-@RestController
-@RequestMapping("/sec-setting")
-public class SecSettingController {
-
-    @Autowired
-    private SecSettingService secSettingService;
-
-    /**
-     * 查询详情
-     */
-    @ApiOperation(value = "低库存警告查询")
-    @PostMapping(value = "/getDetailById")
-    public ApiResult<SecSetting> getDetailById() {
-        return ApiResult.success(secSettingService.getById(1));
-    }
-
-    /**
-     * 低库存警告修改
-     */
-    @ApiOperation(value = "低库存警告修改")
-    @PostMapping(value = "/updateById")
-    public ApiResult<String> updateById(@RequestBody SecSetting secSetting) {
-        secSettingService.updateById(secSetting);
-        return ApiResult.success();
-    }
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TAppUserController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TAppUserController.java
deleted file mode 100644
index 52f191b..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TAppUserController.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TAppUser;
-import com.jilongda.optometrist.model.TCouponReceive;
-import com.jilongda.optometrist.model.TOptometry;
-import com.jilongda.optometrist.model.TOrder;
-import com.jilongda.optometrist.query.TAppUserCouponQuery;
-import com.jilongda.optometrist.query.TAppUserQuery;
-import com.jilongda.optometrist.query.TOptometristQuery;
-import com.jilongda.optometrist.service.TAppUserService;
-import com.jilongda.optometrist.service.TCouponReceiveService;
-import com.jilongda.optometrist.service.TOptometryService;
-import com.jilongda.optometrist.service.TOrderService;
-import com.jilongda.optometrist.vo.TAppUserCouponVO;
-import com.jilongda.optometrist.vo.TAppUserVO;
-import com.jilongda.optometrist.vo.TOptometristVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 用户表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@Api(tags = "用户管理")
-@RequestMapping("/t-app-user")
-public class TAppUserController {
-
-    @Resource
-    private TAppUserService appUserService;
-    @Resource
-    private TOrderService orderService;
-    @Resource
-    private TOptometryService tOptometryService;
-    @Resource
-    private TCouponReceiveService couponReceiveService;
-    @ApiOperation(value = "用户列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TAppUserVO>> pageList(@RequestBody TAppUserQuery query) {
-        if (StringUtils.hasLength(query.getStartTime())){
-            query.setStartTime(query.getStartTime()+" 00:00:00");
-            query.setEndTime(query.getEndTime()+" 23:59:59");
-        }
-        PageInfo<TAppUserVO> appUserVOPageInfo = appUserService.pageList(query);
-        return ApiResult.success(appUserVOPageInfo);
-    }
-    @ApiOperation(value = "启用/禁用")
-    @GetMapping(value = "/updateState")
-    public ApiResult updateState(Integer id) {
-        TAppUser byId = appUserService.getById(id);
-        if (byId.getStatus()==1){
-            byId.setStatus(2);
-        }else{
-            byId.setStatus(1);
-        }
-        appUserService.updateById(byId);
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "用户详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TAppUserVO> getDetailById(Integer id) {
-        TAppUser byId = appUserService.getById(id);
-        TAppUserVO tAppUserVO = new TAppUserVO();
-        BeanUtils.copyProperties(byId, tAppUserVO);
-        // 查询消费次数
-        long l = orderService.count(new LambdaQueryWrapper<TOrder>()
-                .eq(TOrder::getUserId, tAppUserVO.getId()));
-        tAppUserVO.setSalesCount((int) l);
-        // 查询验光次数
-        int size = tOptometryService.lambdaQuery().eq(TOptometry::getUserId, tAppUserVO.getId())
-                .eq(TOptometry::getStatus, 3).list().size();
-        tAppUserVO.setOptometryCount(size);
-        // 查询最后消费时间
-        tAppUserVO.setSalesTime(orderService.lambdaQuery().eq(TOrder::getUserId, tAppUserVO.getId())
-                .orderByDesc(TOrder::getCreateTime).last("limit 1").one().getCreateTime());
-        // 查询最后验光时间
-        tAppUserVO.setOptometryTime(tOptometryService.lambdaQuery().eq(TOptometry::getUserId, tAppUserVO.getId())
-                .eq(TOptometry::getStatus, 3).orderByDesc(TOptometry::getCreateTime).last("limit 1").one().getCreateTime());
-        // 查询订单总额
-        BigDecimal reduce = orderService.lambdaQuery().eq(TOrder::getUserId, byId.getId()).list().stream().map(TOrder::getPayMoney)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        tAppUserVO.setSalesAmount(reduce);
-
-        return ApiResult.success(tAppUserVO);
-    }
-    @ApiOperation(value = "用户详情-查看优惠券")
-    @GetMapping(value = "/getCouponDetailById")
-    public ApiResult<PageInfo<TAppUserCouponVO>> getCouponDetailById(@RequestBody TAppUserCouponQuery query) {
-        PageInfo<TAppUserCouponVO> appUserVOPageInfo = couponReceiveService.pageList(query);
-        return ApiResult.success(appUserVOPageInfo);
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TBrandController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TBrandController.java
deleted file mode 100644
index 55d803c..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TBrandController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TBrand;
-import com.jilongda.optometrist.query.TBrandQuery;
-import com.jilongda.optometrist.service.TBrandService;
-import com.jilongda.optometrist.utils.LoginInfoUtil;
-import com.jilongda.optometrist.vo.TBrandVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 镜架-镜片品牌表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "镜架-镜片品牌表")
-@RestController
-@RequestMapping("/t-brand")
-public class TBrandController {
-
-    @Autowired
-    private TBrandService brandService;
-
-    /**
-     * 获取镜架-镜片品牌列表
-     */
-    @ApiOperation(value = "获取镜架-镜片品牌分页列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TBrandVO>> pageList(@RequestBody TBrandQuery query) {
-        return ApiResult.success(brandService.pageList(query));
-    }
-
-    /**
-     * 添加镜架-镜片品牌
-     */
-    @ApiOperation(value = "添加镜架-镜片品牌")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@Validated @RequestBody TBrand dto) {
-        brandService.save(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "修改镜架-镜片品牌--启用、禁用、设置主要品牌接口")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@RequestBody TBrand dto) {
-        brandService.updateById(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "删除镜架-镜片品牌")
-    @DeleteMapping(value = "/deleteById")
-    public ApiResult<Boolean> deleteById(@RequestParam Long id) {
-        return ApiResult.success(brandService.removeById(id));
-    }
-
-    @ApiOperation(value = "批量删除镜架-镜片品牌")
-    @DeleteMapping(value = "/deleteByIds")
-    public ApiResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
-        return ApiResult.success(brandService.removeByIds(ids));
-    }
-
-    @ApiOperation(value = "查询镜架-镜片品牌详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TBrand> getDetailById(@RequestParam Long id) {
-        return ApiResult.success(brandService.getById(id));
-    }
-    
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TCouponController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TCouponController.java
deleted file mode 100644
index 46fa77a..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TCouponController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.common.utils.UUIDUtil;
-import com.jilongda.optometrist.dto.TModelDTO;
-import com.jilongda.optometrist.model.TAppUser;
-import com.jilongda.optometrist.model.TCoupon;
-import com.jilongda.optometrist.model.TCouponReceive;
-import com.jilongda.optometrist.model.TModel;
-import com.jilongda.optometrist.query.TAppUserQuery;
-import com.jilongda.optometrist.query.TCouponQuery;
-import com.jilongda.optometrist.service.TAppUserService;
-import com.jilongda.optometrist.service.TCouponReceiveService;
-import com.jilongda.optometrist.service.TCouponService;
-import com.jilongda.optometrist.utils.QRCodeUtil;
-import com.jilongda.optometrist.vo.TAppUserVO;
-import com.jilongda.optometrist.vo.TCouponInfoVO;
-import com.jilongda.optometrist.vo.TCouponVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
-import org.springframework.beans.BeanUtils;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 优惠券领取记录 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@Api(tags = "优惠券管理")
-@RequestMapping("/t-coupon")
-public class TCouponController {
-    @Resource
-    private TCouponService couponService;
-    @Resource
-    private TCouponReceiveService couponReceiveService;
-    @Resource
-    private TAppUserService appUserService;
-    @ApiOperation(value = "优惠券列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TCouponVO>> pageList(@RequestBody TCouponQuery query) {
-        PageInfo<TCouponVO> appUserVOPageInfo = couponService.pageList(query);
-        return ApiResult.success(appUserVOPageInfo);
-    }
-    @ApiOperation(value = "添加优惠券")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add( @RequestBody TCoupon dto) throws Exception {
-        couponService.save(dto);
-        switch (dto.getType()){
-            case 2:
-                // 全局发放
-                List<Integer> collect = appUserService.lambdaQuery().list().stream()
-                        .map(TAppUser::getId).collect(Collectors.toList());
-                List<TCouponReceive> tCouponReceives = new ArrayList<>();
-                for (Integer i : collect) {
-                    TCouponReceive tCouponReceive = new TCouponReceive();
-                    tCouponReceive.setCouponId(dto.getId());
-                    tCouponReceive.setUserId(i);
-                    tCouponReceive.setType(2);
-                    tCouponReceive.setAmount(dto.getAmount());
-                    tCouponReceive.setStoreId(dto.getStoreId());
-                    if (dto.getTime()!=0){
-                        tCouponReceive.setEndTime(LocalDateTime.now().plusDays(dto.getTime()));
-                    }
-                    tCouponReceive.setAmountCondition(dto.getAmountCondition());
-                    tCouponReceive.setStatus(1);
-                    tCouponReceives.add(tCouponReceive);
-                }
-                couponReceiveService.saveBatch(tCouponReceives);
-                break;
-            case 3:
-                List<TCouponReceive> tCouponReceives1 = new ArrayList<>();
-
-                for (Integer userId : dto.getUserIds()) {
-                    TCouponReceive tCouponReceive = new TCouponReceive();
-                    tCouponReceive.setCouponId(dto.getId());
-                    tCouponReceive.setUserId(userId);
-                    tCouponReceive.setType(2);
-                    tCouponReceive.setAmount(dto.getAmount());
-                    tCouponReceive.setStoreId(dto.getStoreId());
-                    if (dto.getTime()!=0){
-                        tCouponReceive.setEndTime(LocalDateTime.now().plusDays(dto.getTime()));
-                    }
-                    tCouponReceive.setAmountCondition(dto.getAmountCondition());
-                    tCouponReceive.setStatus(1);
-                    tCouponReceives1.add(tCouponReceive);
-                }
-                couponReceiveService.saveBatch(tCouponReceives1);
-                break;
-            case 4:
-                String code = "{\"id\": "+dto.getId()+ "}";
-                BufferedImage blueImage = QRCodeUtil.createImage(code);
-                MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
-                // todo 没有云存储
-//                String s = OssUploadUtil.ossUpload("img/", blueFile);
-                break;
-        }
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "修改优惠券")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update( @RequestBody TCoupon dto) throws Exception {
-        couponService.updateById(dto);
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "优惠券详情")
-    @PostMapping(value = "/getDetail")
-    public ApiResult<TCouponInfoVO> getDetail(Integer id) {
-        TCouponInfoVO tCouponInfoVO = new TCouponInfoVO();
-        TCoupon byId = couponService.getById(id);
-        BeanUtils.copyProperties(byId, tCouponInfoVO);
-        int size = couponReceiveService.list(new LambdaQueryWrapper<TCouponReceive>()
-                .eq(TCouponReceive::getCouponId, id)).size();
-        tCouponInfoVO.setGrantCout(size);
-        int size1 = couponReceiveService.list(new LambdaQueryWrapper<TCouponReceive>()
-                .eq(TCouponReceive::getCouponId, id)
-                .eq(TCouponReceive::getStatus, 2)).size();
-        tCouponInfoVO.setUseCount(size1);
-
-        return ApiResult.success(tCouponInfoVO);
-    }
-    public static MultipartFile convert(BufferedImage bufferedImage, String fileName) throws IOException {
-        // 将 BufferedImage 转换为字节数组
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ImageIO.write(bufferedImage, "png", baos);
-        byte[] bytes = baos.toByteArray();
-
-        // 创建 ByteArrayResource
-        ByteArrayResource resource = new ByteArrayResource(bytes);
-
-        // 创建 MockMultipartFile
-        MockMultipartFile multipartFile = new MockMultipartFile(
-                "file",
-                fileName,
-                "image/png",
-                resource.getInputStream()
-        );
-
-        return multipartFile;
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TCouponReceiveController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TCouponReceiveController.java
deleted file mode 100644
index 32473ce..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TCouponReceiveController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 优惠券 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-coupon-receive")
-public class TCouponReceiveController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TFrameWarehousingDetailController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TFrameWarehousingDetailController.java
deleted file mode 100644
index 64e2d98..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TFrameWarehousingDetailController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 镜架出库入库详细表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-frame-warehousing-detail")
-public class TFrameWarehousingDetailController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryController.java
deleted file mode 100644
index ee00d94..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryController.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.dto.FrameInventoryDTO;
-import com.jilongda.optometrist.dto.GetCurrentByParam;
-import com.jilongda.optometrist.dto.GetCurrentByParamLens;
-import com.jilongda.optometrist.dto.LensInventoryDTO;
-import com.jilongda.optometrist.query.TInventoryQuery;
-import com.jilongda.optometrist.utils.LoginInfoUtil;
-import com.jilongda.optometrist.vo.TInventoryInfoVO;
-import com.jilongda.optometrist.vo.TInventoryVO;
-import com.jilongda.optometrist.model.*;
-import com.jilongda.optometrist.service.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 盘点表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@Api(tags = "盘点管理")
-@RequestMapping("/t-inventory")
-public class TInventoryController {
-
-    @Resource
-    private TInventoryService inventoryService;
-    @Resource
-    private TInventoryFrameDetailService inventoryFrameDetailService;
-    @Resource
-    private TInventoryLensDetailService inventoryLensDetailService;
-    @Resource
-    private LoginInfoUtil loginInfoUtil;
-    @Resource
-    private TFrameGoodsService frameGoodsService;
-    @Resource
-    private TLensGoodsService lensGoodsService;
-    @Resource
-    private TLensSeriesService lensSeriesService;
-    @Resource
-    private TModelService modelService;
-    @Resource
-    private TStoreService storeService;
-    @ApiOperation(value = "盘点分页列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TInventoryVO>> pageList(@RequestBody TInventoryQuery query) {
-        if (StringUtils.hasLength(query.getStartTime())){
-            query.setStartTime(query.getStartTime()+" 00:00:00");
-            query.setEndTime(query.getEndTime()+" 23:59:59");
-        }
-        return ApiResult.success(inventoryService.pageList(query));
-    }
-    @ApiOperation(value = "镜架添加盘点")
-    @PostMapping(value = "/addFrameInventory")
-    public ApiResult addFrameInventory(@RequestBody FrameInventoryDTO query) {
-        TInventory tInventory = new TInventory();
-        BeanUtils.copyProperties(query, tInventory);
-        inventoryService.save(tInventory);
-        for (TInventoryFrameDetail tInventoryFrameDetail : query.getList()) {
-            tInventoryFrameDetail.setInventoryId(tInventory.getId());
-        }
-        inventoryFrameDetailService.saveBatch(query.getList());
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "镜片添加盘点")
-    @PostMapping(value = "/addLensInventory")
-    public ApiResult addLensInventory(@RequestBody LensInventoryDTO query) {
-        TInventory tInventory = new TInventory();
-        BeanUtils.copyProperties(query, tInventory);
-        inventoryService.save(tInventory);
-        for (TInventoryLensDetail tInventoryFrameDetail : query.getList()) {
-            tInventoryFrameDetail.setInventoryId(tInventory.getId());
-        }
-        inventoryLensDetailService.saveBatch(query.getList());
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "镜架-根据品牌id查询对应库存")
-    @PostMapping(value = "/getCountByBrandId")
-    public ApiResult getCountByBrandId(Integer id) {
-        List<Integer> collect = modelService.lambdaQuery().eq(TModel::getBrandId, id)
-                .list().stream().map(TModel::getId).distinct().collect(Collectors.toList());
-        if (collect.isEmpty())collect.add(-1);
-        List<TFrameGoods> list = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect).list();
-        if (list.isEmpty())return ApiResult.success("0");
-        int i = 0;
-        for (TFrameGoods tFrameGoods : list) {
-            i+=tFrameGoods.getTotal();
-        }
-        return ApiResult.success(i);
-    }
-    @ApiOperation(value = "镜架-根据材质id查询对应库存")
-    @PostMapping(value = "/getCountByMaterialId")
-    public ApiResult getCountByMaterialId(Integer id) {
-        List<Integer> collect = modelService.lambdaQuery().eq(TModel::getMaterialId, id)
-                .list().stream().map(TModel::getId).distinct().collect(Collectors.toList());
-        if (collect.isEmpty())collect.add(-1);
-        List<TFrameGoods> list = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect).list();
-        if (list.isEmpty())return ApiResult.success("0");
-        int i = 0;
-        for (TFrameGoods tFrameGoods : list) {
-            i+=tFrameGoods.getTotal();
-        }
-        return ApiResult.success(i);
-    }
-    @ApiOperation(value = "镜架-根据品牌id、型号名称、色号名称、材质id查询当前库存")
-    @PostMapping(value = "/getCurrentByParamFrame")
-    public ApiResult<Integer> getCurrentByParamFrame(@RequestBody GetCurrentByParam getCurrentByParam) {
-        // 根据型号名称 查询型号列表ids
-        List<Integer> collect = modelService.lambdaQuery().eq(TModel::getName, getCurrentByParam.getModel())
-                .eq(TModel::getColor,getCurrentByParam.getColor())
-                .eq(TModel::getMaterialId,getCurrentByParam.getMaterialId())
-                .eq(TModel::getBrandId,getCurrentByParam.getBrandId())
-                .list().stream().map(TModel::getId).collect(Collectors.toList());
-        TFrameGoods one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect)
-                .eq(TFrameGoods::getColor, getCurrentByParam.getColor()).one();
-        if (one!=null){
-            return ApiResult.success(one.getTotal());
-
-        }
-        return ApiResult.success(0);
-    }
-    @ApiOperation(value = "镜片-根据品牌id、型号名称、色号名称、材质id查询当前库存")
-    @PostMapping(value = "/getCurrentByParamLens")
-    public ApiResult<Integer> getCurrentByParamLens(@RequestBody GetCurrentByParamLens dto) {
-        TLensGoods one = lensGoodsService.lambdaQuery().in(TLensGoods::getSeriesId, dto.getSeriesId())
-                .eq(dto.getLensType()!=null,TLensGoods::getLensType, dto.getLensType())
-                .eq(dto.getRefractiveIndex()!=null,TLensGoods::getRefractiveIndex, dto.getRefractiveIndex())
-                .eq(dto.getBallMirror()!=null,TLensGoods::getBallMirror, dto.getBallMirror())
-                .eq(dto.getColumnMirror()!=null,TLensGoods::getColumnMirror, dto.getColumnMirror())
-                .one();
-        if (one!=null){
-            return ApiResult.success(one.getTotal());
-        }
-        return ApiResult.success(0);
-    }
-    @ApiOperation(value = "查看详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TInventoryInfoVO> getDetailById(Integer id) {
-        TInventoryInfoVO tInventoryInfoVO = new TInventoryInfoVO();
-
-        TInventory byId = inventoryService.getById(id);
-        BeanUtils.copyProperties(byId, tInventoryInfoVO);
-        switch (byId.getType()){
-            case 1:
-                List<TInventoryFrameDetail> list = inventoryFrameDetailService.lambdaQuery().eq(TInventoryFrameDetail::getInventoryId, id).list();
-                tInventoryInfoVO.setFrameList(list);
-                break;
-            case 2:
-                List<TInventoryLensDetail> list2 = inventoryLensDetailService.lambdaQuery().eq(TInventoryLensDetail::getInventoryId, id).list();
-                tInventoryInfoVO.setLensList(list2);
-                break;
-        }
-        TStore byId1 = storeService.getById(byId.getStoreId());
-        if (byId1!=null)tInventoryInfoVO.setStore(byId1.getName());
-        return ApiResult.success(tInventoryInfoVO);
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryFrameDetailController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryFrameDetailController.java
deleted file mode 100644
index 67ad18a..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryFrameDetailController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 材质表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-inventory-frame-detail")
-public class TInventoryFrameDetailController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryLensDetailController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryLensDetailController.java
deleted file mode 100644
index fafb14b..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TInventoryLensDetailController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 镜架盘点详细表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-inventory-lens-detail")
-public class TInventoryLensDetailController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TLensSeriesController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TLensSeriesController.java
deleted file mode 100644
index d8339a4..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TLensSeriesController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonArray;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TLensSeries;
-import com.jilongda.optometrist.model.TOptometrist;
-import com.jilongda.optometrist.query.TLensSeriesQuery;
-import com.jilongda.optometrist.query.TOptometristQuery;
-import com.jilongda.optometrist.service.TLensSeriesService;
-import com.jilongda.optometrist.vo.TLensSeriesVO;
-import com.jilongda.optometrist.vo.TOptometristVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 镜片系列表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "镜片系列管理")
-@RestController
-@RequestMapping("/t-lens-series")
-public class TLensSeriesController {
-    @Autowired
-    private TLensSeriesService lensSeriesService;
-    @ApiOperation(value = "镜片系列列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TLensSeriesVO>> pageList(@RequestBody TLensSeriesQuery query) {
-        PageInfo<TLensSeriesVO> optometristVOPageInfo = lensSeriesService.pageList(query);
-        return ApiResult.success(optometristVOPageInfo);
-    }
-    @ApiOperation(value = "镜片系列添加")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@RequestBody TLensSeries dto) {
-        lensSeriesService.save(dto);
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "镜片系列编辑")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@RequestBody TLensSeries dto) {
-        if (!StringUtils.hasLength(dto.getSphere())){
-            dto.setSphere("");
-        }
-        if (!StringUtils.hasLength(dto.getAsphericSurface())){
-            dto.setAsphericSurface("");
-        }
-        if (!StringUtils.hasLength(dto.getDoubleNon())){
-            dto.setDoubleNon("");
-        }
-        lensSeriesService.updateById(dto);
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "镜片系列启用/禁用")
-    @GetMapping(value = "/updateState")
-    public ApiResult<String> update(Integer id) {
-        TLensSeries byId = lensSeriesService.getById(id);
-        if (byId.getStatus()==1){
-            byId.setStatus(2);
-        }else{
-            byId.setStatus(1);
-        }
-        lensSeriesService.updateById(byId);
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "通过品牌id查询镜片系列列表")
-    @GetMapping(value = "/seriesList")
-    public ApiResult<List<TLensSeries>> seriesList(Integer brandId) {
-        return ApiResult.success(lensSeriesService.lambdaQuery().eq(TLensSeries::getBrandId,brandId).list());
-    }
-    @ApiOperation(value = "通过系列id查询球/非球 返回参数1为球 2非球 3双飞")
-    @GetMapping(value = "/lensTypeList")
-    public ApiResult<List<Integer>> lensTypeList(Integer id) {
-        TLensSeries byId = lensSeriesService.getById(id);
-        List<Integer> integers = new ArrayList<>();
-        if (StringUtils.hasLength(byId.getSphere())){
-            integers.add(1);
-        }
-        if (StringUtils.hasLength(byId.getAsphericSurface())){
-            integers.add(2);
-        }
-        if (StringUtils.hasLength(byId.getDoubleNon())){
-            integers.add(3);
-        }
-        return ApiResult.success(integers);
-    }
-    @ApiOperation(value = "根据系列id + 球/非球查询折射率列表 球/非球入参数1为球 2非球 3双飞")
-    @GetMapping(value = "/refractiveIndexList")
-    public ApiResult<List<String>> refractiveIndexList(Integer id, Integer lensType) {
-        TLensSeries byId = lensSeriesService.getById(id);
-        if (lensType==1){
-            String sphere = byId.getSphere();
-            // 将字符串化为jsonArray
-            if (StringUtils.hasLength(sphere)) {
-                JSONObject.parseArray(sphere);
-            } else {
-                return ApiResult.success(new ArrayList<String>());
-            }
-        }
-        if (lensType==2){
-            String asphericSurface = byId.getAsphericSurface();
-            if (StringUtils.hasLength(asphericSurface)) {
-                JSONObject.parseArray(asphericSurface);
-            } else {
-                return ApiResult.success(new ArrayList<String>());
-            }
-        }
-        if (lensType==3){
-            String doubleNon = byId.getDoubleNon();
-            if (StringUtils.hasLength(doubleNon)) {
-                JSONObject.parseArray(doubleNon);
-            } else {
-                return ApiResult.success(new ArrayList<String>());
-            }
-        }
-        return ApiResult.success(new ArrayList<String>());
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TLensWarehousingDetailController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TLensWarehousingDetailController.java
deleted file mode 100644
index 0c938b5..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TLensWarehousingDetailController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 镜片出库入库明细表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-lens-warehousing-detail")
-public class TLensWarehousingDetailController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TLineUpController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TLineUpController.java
deleted file mode 100644
index 3e587c4..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TLineUpController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TAppUser;
-import com.jilongda.optometrist.model.TLineUp;
-import com.jilongda.optometrist.model.TOptometryDetail;
-import com.jilongda.optometrist.query.TLineUpQuery;
-import com.jilongda.optometrist.query.TOptometryQuery;
-import com.jilongda.optometrist.service.TAppUserService;
-import com.jilongda.optometrist.service.TLineUpService;
-import com.jilongda.optometrist.vo.TOptometryVO;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- * 排号管理 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-line-up")
-public class TLineUpController {
-    @Autowired
-    private TLineUpService lineUpService;
-    @Autowired
-    private TAppUserService appUserService;
-    @ApiOperation(value = "获取排号分页列表",tags = "排号管理")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TLineUp>> pageList(@RequestBody TLineUpQuery query) {
-        PageInfo<TLineUp> res = lineUpService.pageList(query);
-        return ApiResult.success(res);
-    }
-    @ApiOperation(value = "查询当前排队人数",tags = "排号a管理")
-    @PostMapping(value = "/getCount")
-    public ApiResult getCount() {
-        return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStatus,1).list().size());
-    }
-    @ApiOperation(value = "取消排队",tags = "排号管理")
-    @GetMapping(value = "/cancel")
-    public ApiResult cancel(Integer id) {
-        TLineUp byId = lineUpService.getById(id);
-        byId.setStatus(5);
-        lineUpService.updateById(byId);
-        return ApiResult.success();
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TMaterialController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TMaterialController.java
deleted file mode 100644
index e974011..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TMaterialController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TMaterial;
-import com.jilongda.optometrist.query.TMaterialQuery;
-import com.jilongda.optometrist.service.TMaterialService;
-import com.jilongda.optometrist.vo.TMaterialVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 材质表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "材质管理")
-@RestController
-@RequestMapping("/t-material")
-public class TMaterialController {
-
-    @Autowired
-    private TMaterialService materialService;
-
-    /**
-     * 获取材质列表
-     */
-    @ApiOperation(value = "获取材质分页列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TMaterialVO>> pageList(@RequestBody TMaterialQuery query) {
-        return ApiResult.success(materialService.pageList(query));
-    }
-
-    /**
-     * 获取材质列表
-     */
-    @ApiOperation(value = "获取材质列表")
-    @PostMapping(value = "/list")
-    public ApiResult<List<TMaterial>> list(@RequestBody TMaterialQuery query) {
-        List<TMaterial> list = materialService.list(Wrappers.lambdaQuery(TMaterial.class)
-                .eq(TMaterial::getStatus, 1));
-        return ApiResult.success(list);
-    }
-
-    /**
-     * 添加材质
-     */
-    @ApiOperation(value = "添加材质")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@Validated @RequestBody TMaterial dto) {
-        Boolean flag = materialService.isExit(dto.getId(), dto.getName());
-        if(flag){
-            return ApiResult.failed("材质名称已存在");
-        }
-        materialService.save(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "修改材质")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@Validated @RequestBody TMaterial dto) {
-        Boolean flag = materialService.isExit(dto.getId(), dto.getName());
-        if(flag){
-            return ApiResult.failed("材质名称已存在");
-        }
-        materialService.updateById(dto);
-        return ApiResult.success();
-    }
-
-    /**
-     * 材质启用禁用
-     */
-    @ApiOperation(value = "材质启用禁用")
-    @GetMapping(value = "/upAndDown")
-    public ApiResult<Boolean> upAndDown(@RequestParam Long id,
-                                        @RequestParam Integer status) {
-        return ApiResult.success(materialService.upAndDown(id,status));
-    }
-
-    @ApiOperation(value = "删除材质")
-    @DeleteMapping(value = "/deleteById")
-    public ApiResult<Boolean> deleteById(@RequestParam Long id) {
-        return ApiResult.success(materialService.removeById(id));
-    }
-
-    @ApiOperation(value = "批量删除材质")
-    @DeleteMapping(value = "/deleteByIds")
-    public ApiResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
-        return ApiResult.success(materialService.removeByIds(ids));
-    }
-
-    @ApiOperation(value = "查询材质详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TMaterial> getDetailById(@RequestParam Long id) {
-        return ApiResult.success(materialService.getById(id));
-    }
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TModelController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TModelController.java
deleted file mode 100644
index 4e0fb00..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TModelController.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.dto.TModelDTO;
-import com.jilongda.optometrist.model.TModel;
-import com.jilongda.optometrist.query.TModelQuery;
-import com.jilongda.optometrist.service.TModelService;
-import com.jilongda.optometrist.vo.TModelVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 镜架型号表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "镜架型号表")
-@RestController
-@RequestMapping("/t-model")
-public class TModelController {
-
-    @Autowired
-    private TModelService modelService;
-
-    /**
-     * 获取镜架型号列表
-     */
-    @ApiOperation(value = "获取镜架型号分页列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TModelVO>> pageList(@RequestBody TModelQuery query) {
-        return ApiResult.success(modelService.pageList(query));
-    }
-
-    /**
-     * 通过品牌查询型号列表
-     */
-    @ApiOperation(value = "通过品牌id查询型号列表")
-    @GetMapping(value = "/getListByBrandId")
-    public ApiResult<List<TModel>> pageList(@RequestParam Integer brandId) {
-        List<TModel> list = modelService.list(Wrappers.lambdaQuery(TModel.class)
-                .eq(TModel::getBrandId, brandId)
-                .groupBy(TModel::getName));
-        return ApiResult.success(list);
-    }
-
-    /**
-     * 通过型号查询色号列表
-     */
-    @ApiOperation(value = "通过型号查询色号列表")
-    @GetMapping(value = "/getListByName")
-    public ApiResult<List<TModel>> pageList(@RequestParam String name) {
-        List<TModel> list = modelService.list(Wrappers.lambdaQuery(TModel.class)
-                .eq(TModel::getName, name));
-        return ApiResult.success(list);
-    }
-
-    /**
-     * 添加镜架型号
-     */
-    @ApiOperation(value = "添加镜架型号")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@Validated @RequestBody TModelDTO dto) {
-        List<String> colorList = dto.getColorList();
-        List<TModel> models = new ArrayList<>();
-        for (String s : colorList) {
-            TModel model = new TModel();
-            BeanUtils.copyProperties(dto, model);
-            model.setColor(s);
-            models.add(model);
-        }
-        modelService.saveBatch(models);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "修改镜架型号")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@RequestBody TModelDTO dto) {
-
-        modelService.remove(Wrappers.lambdaQuery(TModel.class)
-                .eq(TModel::getName,dto.getName()));
-
-        List<String> colorList = dto.getColorList();
-        List<TModel> models = new ArrayList<>();
-        for (String s : colorList) {
-            TModel model = new TModel();
-            BeanUtils.copyProperties(dto, model);
-            model.setId(null);
-            model.setColor(s);
-            models.add(model);
-        }
-        modelService.saveBatch(models);
-        return ApiResult.success();
-    }
-
-    /**
-     * 镜架型号上下架
-     */
-    @ApiOperation(value = "镜架型号上下架--列表使用")
-    @GetMapping(value = "/upAndDown")
-    public ApiResult<Boolean> upAndDown(@RequestParam String name,
-                                   @RequestParam Integer status) {
-        return ApiResult.success(modelService.upAndDown(name,status));
-    }
-
-    /**
-     * 镜架型号上下架
-     */
-    @ApiOperation(value = "镜架型号上下架--修改界面使用")
-    @GetMapping(value = "/upAndDownColor")
-    public ApiResult<Boolean> upAndDownColor(@RequestParam String name,
-                                        @RequestParam String color,
-                                        @RequestParam Integer status) {
-        return ApiResult.success(modelService.upAndDownColor(name,color,status));
-    }
-
-    @ApiOperation(value = "删除镜架型号")
-    @DeleteMapping(value = "/deleteByName")
-    public ApiResult<String> deleteById(@RequestParam String name) {
-        modelService.remove(Wrappers.lambdaQuery(TModel.class)
-                .eq(TModel::getName, name));
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "批量删除镜架型号")
-    @DeleteMapping(value = "/deleteByNames")
-    public ApiResult<String> deleteByIds(@RequestBody List<String> names) {
-        modelService.remove(Wrappers.lambdaQuery(TModel.class)
-                .in(TModel::getName, names));
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "查询镜架型号详情")
-    @GetMapping(value = "/getDetailByName")
-    public ApiResult<TModelVO> getDetailById(@RequestParam String name) {
-        List<TModel> models = modelService.list(Wrappers.lambdaQuery(TModel.class)
-                .eq(TModel::getName, name));
-        TModelVO modelVO = new TModelVO();
-        BeanUtils.copyProperties(models.get(0), modelVO);
-        List<String> colorList = models.stream().map(TModel::getColor).collect(Collectors.toList());
-        modelVO.setColorList(colorList);
-        return ApiResult.success(modelVO);
-    }
-    
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometryController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometryController.java
deleted file mode 100644
index 9ff63ad..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometryController.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TAppUser;
-import com.jilongda.optometrist.model.TOptometryDetail;
-import com.jilongda.optometrist.model.TSupplier;
-import com.jilongda.optometrist.query.TOptometryQuery;
-import com.jilongda.optometrist.query.TSupplierQuery;
-import com.jilongda.optometrist.service.TAppUserService;
-import com.jilongda.optometrist.service.TOptometristService;
-import com.jilongda.optometrist.service.TOptometryDetailService;
-import com.jilongda.optometrist.service.TSupplierService;
-import com.jilongda.optometrist.vo.TOptometryVO;
-import com.jilongda.optometrist.vo.TSupplierVO;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 验光单 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-optometry")
-public class TOptometryController {
-    @Autowired
-    private TSupplierService supplierService;
-    @Autowired
-    private TOptometristService optometristService;
-    @Autowired
-    private TOptometryDetailService optometryDetailService;
-    @Autowired
-    private TAppUserService appUserService;
-
-    /**
-     * 获取供应商列表
-     */
-    @ApiOperation(value = "获取验光单分页列表",tags = "验光单")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TOptometryVO>> pageList(@RequestBody TOptometryQuery query) {
-        String startTime = null;
-        String endTime = null;
-        if (StringUtils.hasLength(query.getCreateTime())){
-            String[] split = query.getCreateTime().split(" - ");
-            startTime = split[0]+" 00:00:00";
-            endTime = split[1]+" 23:59:59";
-        }
-        query.setStartTime(startTime);
-        query.setEndTime(endTime);
-        PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query);
-        List<TOptometryVO> records = tOptometryVOPageInfo.getRecords();
-        for (TOptometryVO record : records) {
-            if (record.getUserId()!=null){
-                TAppUser byId = appUserService.getById(record.getUserId());
-                if (byId!=null){
-                    record.setName(byId.getName());
-                }
-            }
-            TOptometryDetail l = optometryDetailService.lambdaQuery()
-                    .eq(TOptometryDetail::getOptometryId, record.getId())
-                    .eq(TOptometryDetail::getType,1)
-                    .eq(TOptometryDetail::getStatus,1)
-                    .one();
-            TOptometryDetail r = optometryDetailService.lambdaQuery()
-                    .eq(TOptometryDetail::getOptometryId, record.getId())
-                    .eq(TOptometryDetail::getType,1)
-                    .eq(TOptometryDetail::getStatus,2)
-                    .one();
-            double templ = 0.0;
-            double tempr = 0.0;
-            if (l!=null){
-                record.setLValue(l.getBallMirror().toString()+(l.getColumnMirror()!=null?"-"+l.getColumnMirror():""));
-                templ = Double.parseDouble(l.getPupilDistance());
-            }
-            if (r!=null){
-                record.setRValue(r.getBallMirror().toString()+(r.getColumnMirror()!=null?"-"+r.getColumnMirror():""));
-                tempr = Double.parseDouble(r.getPupilDistance());
-
-            }
-            record.setPupilDistance((templ+tempr)+"");
-        }
-        return ApiResult.success(tOptometryVOPageInfo);
-    }
-    @ApiOperation(value = "查询验光单详情",tags = "验光单")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<List<TOptometryDetail>> getDetailById(@RequestParam Integer id) {
-        List<TOptometryDetail> list = optometryDetailService.lambdaQuery()
-                .eq(TOptometryDetail::getOptometryId, id)
-                .list();
-        return ApiResult.success(list);
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometryDetailController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometryDetailController.java
deleted file mode 100644
index 77406a0..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometryDetailController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 验光单详情 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-optometry-detail")
-public class TOptometryDetailController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderAccountingController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderAccountingController.java
deleted file mode 100644
index ddb4cbf..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderAccountingController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 订单核算表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@RestController
-@RequestMapping("/t-order-accounting")
-public class TOrderAccountingController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderAftersalesController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderAftersalesController.java
deleted file mode 100644
index 6d9f77e..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderAftersalesController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.common.constants.WarehousingConstant;
-import com.jilongda.common.utils.CodeGenerateUtils;
-import com.jilongda.optometrist.model.TOptometrist;
-import com.jilongda.optometrist.model.TOrderAftersales;
-import com.jilongda.optometrist.query.TOptometristQuery;
-import com.jilongda.optometrist.query.TOrderAftersalesQuery;
-import com.jilongda.optometrist.service.TOrderAftersalesService;
-import com.jilongda.optometrist.vo.TOptometristVO;
-import com.jilongda.optometrist.vo.TOrderAftersalesVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 订单售后表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "订单售后管理")
-@RestController
-@RequestMapping("/t-order-aftersales")
-public class TOrderAftersalesController {
-
-
-    @Autowired
-    private TOrderAftersalesService orderAftersalesService;
-
-
-    @ApiOperation(value = "订单售后列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TOrderAftersalesVO>> pageList(@RequestBody TOrderAftersalesQuery query) {
-        PageInfo<TOrderAftersalesVO> orderAftersalesVOPageInfo = orderAftersalesService.pageList(query);
-        return ApiResult.success(orderAftersalesVOPageInfo);
-    }
-
-    @ApiOperation(value = "订单售后添加")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@RequestBody TOrderAftersales dto) {
-        dto.setCode(WarehousingConstant.ASTER_SALES+ CodeGenerateUtils.generateVolumeSn());
-        orderAftersalesService.save(dto);
-        return ApiResult.success();
-    }
-
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderController.java
deleted file mode 100644
index bdc2397..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOrderController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 销售订单表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "")
-@RestController
-@RequestMapping("/t-order")
-public class TOrderController {
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TStoreController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TStoreController.java
deleted file mode 100644
index d70e0dd..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TStoreController.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.Region;
-import com.jilongda.optometrist.model.TStore;
-import com.jilongda.optometrist.query.TStoreQuery;
-import com.jilongda.optometrist.service.ITRegionService;
-import com.jilongda.optometrist.service.TStoreService;
-import com.jilongda.optometrist.utils.LoginInfoUtil;
-import com.jilongda.optometrist.vo.TStoreVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- * 门店表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "门店管理")
-@RestController
-@RequestMapping("/t-store")
-public class TStoreController {
-
-    @Autowired
-    private TStoreService storeService;
-    @Autowired
-    private LoginInfoUtil loginInfoUtil;
-    @Autowired
-    private ITRegionService regionService;
-
-    /**
-     * 获取门店列表
-     */
-    @ApiOperation(value = "获取门店分页列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TStoreVO>> pageList(@RequestBody TStoreQuery query) {
-        Integer userType = loginInfoUtil.getLoginUser().getUserType();
-        if(!Objects.equals(userType,1)){
-            query.setStatus(1);
-        }
-        return ApiResult.success(storeService.pageList(query));
-    }
-    @ApiOperation(value = "省市区三级联动 获取省不传值 市区县传上级code")
-    @GetMapping(value = "/list")
-    public ApiResult<List<Region>> add(String code) {
-        if (!StringUtils.hasLength(code)){
-            return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,0).list());
-        }else{
-            return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,regionService.lambdaQuery().eq(Region::getCode,code).one().getId()).list());
-
-        }
-    }
-    /**
-     * 添加门店
-     */
-    @ApiOperation(value = "添加门店")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@Validated @RequestBody TStore dto) {
-        storeService.save(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "修改门店")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@Validated @RequestBody TStore dto) {
-        storeService.updateById(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "删除门店")
-    @DeleteMapping(value = "/deleteById")
-    public ApiResult<Boolean> deleteById(@RequestParam Long id) {
-        return ApiResult.success(storeService.removeById(id));
-    }
-
-    @ApiOperation(value = "批量删除门店")
-    @DeleteMapping(value = "/deleteByIds")
-    public ApiResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
-        return ApiResult.success(storeService.removeByIds(ids));
-    }
-
-    @ApiOperation(value = "查询门店详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TStore> getDetailById(@RequestParam Long id) {
-        return ApiResult.success(storeService.getById(id));
-    }
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TSupplierController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TSupplierController.java
deleted file mode 100644
index c4d3403..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TSupplierController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TSupplier;
-import com.jilongda.optometrist.query.TSupplierQuery;
-import com.jilongda.optometrist.service.TSupplierService;
-import com.jilongda.optometrist.vo.TSupplierVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 供应商 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "供应商管理")
-@RestController
-@RequestMapping("/t-supplier")
-public class TSupplierController {
-    @Autowired
-    private TSupplierService supplierService;
-
-    /**
-     * 获取供应商列表
-     */
-    @ApiOperation(value = "获取供应商分页列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TSupplierVO>> pageList(@RequestBody TSupplierQuery query) {
-        return ApiResult.success(supplierService.pageList(query));
-    }
-
-    /**
-     * 获取供应商列表
-     */
-    @ApiOperation(value = "获取供应商列表")
-    @PostMapping(value = "/list")
-    public ApiResult<List<TSupplier>> list(@RequestBody TSupplierQuery query) {
-        LambdaQueryWrapper<TSupplier> wrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.hasLength(query.getName())){
-            wrapper.like(TSupplier::getName, query.getName());
-        }
-        wrapper.eq(TSupplier::getStatus, 1);
-        List<TSupplier> list = supplierService.list(wrapper);
-        return ApiResult.success(list);
-    }
-
-    /**
-     * 添加供应商
-     */
-    @ApiOperation(value = "添加供应商")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@Validated @RequestBody TSupplier dto) {
-        Boolean flag = supplierService.isExit(dto.getId(), dto.getName());
-        if(flag){
-            return ApiResult.failed("供应商名称已存在");
-        }
-        supplierService.save(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "修改供应商")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@Validated @RequestBody TSupplier dto) {
-        Boolean flag = supplierService.isExit(dto.getId(), dto.getName());
-        if(flag){
-            return ApiResult.failed("供应商名称已存在");
-        }
-        supplierService.updateById(dto);
-        return ApiResult.success();
-    }
-
-    /**
-     * 供应商启用禁用
-     */
-    @ApiOperation(value = "供应商启用禁用")
-    @GetMapping(value = "/upAndDown")
-    public ApiResult<Boolean> upAndDown(@RequestParam Long id,
-                                        @RequestParam Integer status) {
-        return ApiResult.success(supplierService.upAndDown(id,status));
-    }
-
-    @ApiOperation(value = "删除供应商")
-    @DeleteMapping(value = "/deleteById")
-    public ApiResult<Boolean> deleteById(@RequestParam Long id) {
-        return ApiResult.success(supplierService.removeById(id));
-    }
-
-    @ApiOperation(value = "批量删除供应商")
-    @DeleteMapping(value = "/deleteByIds")
-    public ApiResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
-        return ApiResult.success(supplierService.removeByIds(ids));
-    }
-
-    @ApiOperation(value = "查询供应商详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TSupplier> getDetailById(@RequestParam Long id) {
-        return ApiResult.success(supplierService.getById(id));
-    }
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TTicketController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TTicketController.java
deleted file mode 100644
index 3e5beaa..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TTicketController.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.model.TTicket;
-import com.jilongda.optometrist.query.TWarehousingDetailQuery;
-import com.jilongda.optometrist.query.TicketQuery;
-import com.jilongda.optometrist.service.TTicketService;
-import com.jilongda.optometrist.vo.TFrameWarehousingDetailVO;
-import com.jilongda.optometrist.vo.TTicketVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- * 小票机 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "小票机")
-@RestController
-@RequestMapping("/t-ticket")
-public class TTicketController {
-
-
-    @Autowired
-    private TTicketService tTicketService;
-
-    @ApiOperation(value = "小票机列表")
-    @PostMapping(value = "/pageList")
-    public ApiResult<PageInfo<TTicketVO>> pageList(@RequestBody TicketQuery query) {
-        PageInfo<TTicketVO> ticketVOPageInfo = tTicketService.pageList(query);
-        return ApiResult.success(ticketVOPageInfo);
-    }
-
-    @ApiOperation(value = "小票机添加")
-    @PostMapping(value = "/add")
-    public ApiResult<String> add(@RequestBody TTicket dto) {
-        tTicketService.save(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "小票机编辑")
-    @PostMapping(value = "/update")
-    public ApiResult<String> update(@RequestBody TTicket dto) {
-        tTicketService.updateById(dto);
-        return ApiResult.success();
-    }
-
-    @ApiOperation(value = "小票机上下架")
-    @GetMapping(value = "/upAndDown")
-    public ApiResult<Boolean> upAndDown(@RequestParam Integer id,
-                                        @RequestParam Integer status) {
-        return ApiResult.success(tTicketService.upAndDown(id,status));
-    }
-
-}
-
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TWarehousingController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TWarehousingController.java
deleted file mode 100644
index ccb54c5..0000000
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TWarehousingController.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package com.jilongda.optometrist.controller;
-
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.jilongda.common.basic.ApiResult;
-import com.jilongda.common.basic.PageInfo;
-import com.jilongda.common.constants.WarehousingConstant;
-import com.jilongda.common.enums.WarehousingTypeEnum;
-import com.jilongda.common.security.JwtTokenUtils;
-import com.jilongda.common.utils.CodeGenerateUtils;
-import com.jilongda.common.utils.UUIDUtil;
-import com.jilongda.optometrist.dto.GetCurrentByParam;
-import com.jilongda.optometrist.dto.GetCurrentByParamLens;
-import com.jilongda.optometrist.dto.TWarehousingDTO;
-import com.jilongda.optometrist.dto.TWarehousingLensDTO;
-import com.jilongda.optometrist.model.*;
-import com.jilongda.optometrist.query.TFrameGoodsQuery;
-import com.jilongda.optometrist.query.TLensGoodsQuery;
-import com.jilongda.optometrist.query.TWarehousingDetailLensQuery;
-import com.jilongda.optometrist.query.TWarehousingDetailQuery;
-import com.jilongda.optometrist.service.*;
-import com.jilongda.optometrist.vo.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 镜架-镜片出库入库表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-12-09
- */
-@Api(tags = "镜架-镜片出库入库")
-@RestController
-@RequestMapping("/t-warehousing")
-public class TWarehousingController {
-
-    @Autowired
-    private TWarehousingService warehousingService;
-    @Autowired
-    private TFrameWarehousingDetailService frameWarehousingDetailService;
-    @Autowired
-    private TLensWarehousingDetailService lensWarehousingDetailService;
-    @Autowired
-    private TFrameGoodsService frameGoodsService;
-    @Autowired
-    private TLensGoodsService lensGoodsService;
-    @Autowired
-    private TModelService modelService;
-    @Autowired
-    private TLensSeriesService lensSeriesService;
-    @Autowired
-    private TStoreService storeService;
-    @Autowired
-    private TBrandService brandService;
-    /**
-     * 通过型号查询色号列表
-     */
-    @ApiOperation(value = "镜架-根据品牌id、型号名称、色号名称查询当前库存")
-    @PostMapping(value = "/getCurrentByParamFrame")
-    public ApiResult<Integer> getCurrentByParamFrame(@RequestBody GetCurrentByParam getCurrentByParam) {
-        // 根据型号名称 查询型号列表ids
-        List<Integer> collect = modelService.lambdaQuery().eq(TModel::getName, getCurrentByParam.getModel())
-                .eq(TModel::getMaterialId,getCurrentByParam.getMaterialId())
-                .eq(TModel::getColor,getCurrentByParam.getColor())
-                .eq(TModel::getBrandId,getCurrentByParam.getBrandId())
-                .list().stream().map(TModel::getId).collect(Collectors.toList());
-        TFrameGoods one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect)
-                .eq(TFrameGoods::getColor, getCurrentByParam.getColor()).one();
-        if (one!=null){
-            return ApiResult.success(one.getTotal());
-
-        }
-        return ApiResult.success(0);
-    }
-    @ApiOperation(value = "镜片-根据品牌id、型号名称、色号名称、材质id查询当前库存")
-    @PostMapping(value = "/getCurrentByParamLens")
-    public ApiResult<Integer> getCurrentByParamLens(@RequestBody GetCurrentByParamLens dto) {
-        TLensGoods one = lensGoodsService.lambdaQuery().in(TLensGoods::getSeriesId, dto.getSeriesId())
-                .eq(dto.getLensType()!=null,TLensGoods::getLensType, dto.getLensType())
-                .eq(dto.getRefractiveIndex()!=null,TLensGoods::getRefractiveIndex, dto.getRefractiveIndex())
-                .eq(dto.getBallMirror()!=null,TLensGoods::getBallMirror, dto.getBallMirror())
-                .eq(dto.getColumnMirror()!=null,TLensGoods::getColumnMirror, dto.getColumnMirror())
-                .one();
-        if (one!=null){
-            return ApiResult.success(one.getTotal());
-        }
-        return ApiResult.success(0);
-    }
-    @ApiOperation(value = "镜架库存分页列表")
-    @PostMapping(value = "/frameReceiptList")
-    public ApiResult<PageInfo<TFrameGoodsVO>> frameReceiptList(@RequestBody TFrameGoodsQuery query) {
-        return ApiResult.success(frameGoodsService.lensReceiptList(query));
-    }
-    @ApiOperation(value = "镜片库存分页列表")
-    @PostMapping(value = "/lensReceiptList")
-    public ApiResult<PageInfo<TLensGoodsVO>> lensReceiptList(@RequestBody TLensGoodsQuery query) {
-        return ApiResult.success(lensGoodsService.lensReceiptList(query));
-    }
-    @ApiOperation(value = "镜片库存分页列表-启用禁用")
-    @PostMapping(value = "/updateStateLens")
-    public ApiResult updateStateLens(Integer id) {
-        TLensGoods byId = lensGoodsService.getById(id);
-        if (byId.getStatus()==1){
-            byId.setStatus(2);
-        }else {
-            byId.setStatus(1);
-        }
-        return ApiResult.success();
-    }
-    @ApiOperation(value = "镜架库存分页列表-启用禁用")
-    @PostMapping(value = "/updateStateFrame")
-    public ApiResult updateStateFrame(Integer id) {
-        TFrameGoods byId = frameGoodsService.getById(id);
-        if (byId.getStatus()==1){
-            byId.setStatus(2);
-        }else {
-            byId.setStatus(1);
-        }
-        return ApiResult.success();
-    }
-    /**
-     * 出入库单列表
-     */
-    @ApiOperation(value = "镜架出入库单列表")
-    @PostMapping(value = "/inventoryReceiptList")
-    public ApiResult<PageInfo<TWarehousingVO>> inventoryReceiptList(@RequestBody TWarehousingDetailQuery query) {
-        return ApiResult.success(warehousingService.inventoryReceiptList(query));
-    }
-    @ApiOperation(value = "镜片出入库单列表")
-    @PostMapping(value = "/inventoryReceiptLensList")
-    public ApiResult<PageInfo<TWarehousingLensVO>> inventoryReceiptLensList(@RequestBody TWarehousingDetailLensQuery query) {
-        return ApiResult.success(warehousingService.inventoryReceiptLensList(query));
-    }
-
-    /**
-     * 库存明细记录列表
-     */
-    @ApiOperation(value = "镜架库存明细记录列表")
-    @PostMapping(value = "/detailList")
-    public ApiResult<PageInfo<TFrameWarehousingDetailVO>> detailList(@RequestBody TWarehousingDetailQuery query) {
-        PageInfo<TFrameWarehousingDetailVO> frameWarehousingDetailVOPageInfo = warehousingService.detailList(query);
-        return ApiResult.success(frameWarehousingDetailVOPageInfo);
-    }
-
-    /**
-     * 库存明细记录列表
-     */
-    @ApiOperation(value = "镜片库存明细记录列表--库存详情")
-    @PostMapping(value = "/detailLensList")
-    public ApiResult<TLensGoodsDetailVO> detailLensList(Integer id) {
-        TLensGoodsDetailVO tLensGoodsDetailVO = new TLensGoodsDetailVO();
-        TLensGoods byId = lensGoodsService.getById(id);
-        TStore byId1 = storeService.getById(byId.getStoreId());
-        if (byId1!=null){
-            tLensGoodsDetailVO.setStoreName(byId1.getName());
-        }
-        TLensSeries byId2 = lensSeriesService.getById(byId.getSeriesId());
-        if (byId2!=null){
-            Integer brandId = byId2.getBrandId();
-            TBrand byId3 = brandService.getById(brandId);
-            String t1 = "";
-            switch (byId.getLensType()){
-                case 1:
-                    t1="球面";
-                    break;
-                case 2:
-                    t1="非球面";
-                    break;
-                case 3:
-                    t1="双非";
-                    break;
-            }
-            tLensGoodsDetailVO.setTitle(byId3.getName()+byId2.getName()+t1+" "+byId.getRefractiveIndex());
-        }
-        // 查询这个商品的库存明细
-        List<TLensWarehousingDetail> list = lensWarehousingDetailService.lambdaQuery().eq(TLensWarehousingDetail::getSeriesId, byId.getSeriesId())
-                .eq(TLensWarehousingDetail::getRefractiveIndex, byId.getRefractiveIndex()).list();
-        tLensGoodsDetailVO.setList(list);
-        return ApiResult.success(tLensGoodsDetailVO);
-    }
-
-    /**
-     * 添加镜架出库,入库,作废,退货
-     */
-    @ApiOperation(value = "添加镜架出库,入库,作废,退货")
-    @PostMapping(value = "/outBound")
-    public ApiResult outBound(@Validated @RequestBody TWarehousingDTO dto) {
-        // 获取当前用户
-        String username = JwtTokenUtils.getUsername();
-        dto.setCreateBy(username);
-        dto.setCreateTime(LocalDateTime.now());
-        dto.setType(WarehousingTypeEnum.FRAME.getCode());
-        warehousingService.save(dto);
-
-        // 添加明细
-        List<TFrameWarehousingDetail> frameWarehousingDetails = dto.getFrameWarehousingDetails();
-        frameWarehousingDetails.forEach(detail -> {
-            detail.setWarehousingId(dto.getId());
-            detail.setCode(WarehousingConstant.OUT_BOUND+CodeGenerateUtils.generateVolumeSn());
-        });
-        if (dto.getStatus()==1||dto.getStatus()==3){
-            List<TFrameGoods> list1 = new ArrayList<>();
-            for (TFrameWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
-                TFrameGoods one = frameGoodsService.lambdaQuery().eq(TFrameGoods::getModelId, frameWarehousingDetail.getModelId())
-                        .eq(TFrameGoods::getColor, frameWarehousingDetail.getColor()).one();
-                if (one!=null){
-                    if (one.getTotal()-frameWarehousingDetail.getTotal()<0){
-                        return ApiResult.failed("库存不足");
-                    }
-                    // 增加对应库存
-                    one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
-                    list1.add(one);
-                }
-            }
-            if (!list1.isEmpty())frameGoodsService.updateBatchById(list1);
-        }
-        frameWarehousingDetailService.saveBatch(frameWarehousingDetails);
-
-        if (dto.getStatus()==2 || dto.getStatus()==4){
-            List<TFrameGoods> list1 = new ArrayList<>();
-            List<TFrameGoods> list2 = new ArrayList<>();
-            for (TFrameWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
-                TFrameGoods one = frameGoodsService.lambdaQuery().eq(TFrameGoods::getModelId, frameWarehousingDetail.getModelId())
-                        .eq(TFrameGoods::getColor, frameWarehousingDetail.getColor()).one();
-                if (one!=null){
-                    // 增加对应库存
-                    one.setTotal(one.getTotal()+frameWarehousingDetail.getTotal());
-                    list1.add(one);
-                }else {
-                    // 新增
-                    TFrameGoods tFrameGoods = new TFrameGoods();
-                    tFrameGoods.setColor(frameWarehousingDetail.getColor());
-                    tFrameGoods.setTotal(frameWarehousingDetail.getTotal());
-                    tFrameGoods.setModelId(frameWarehousingDetail.getModelId());
-                    tFrameGoods.setStoreId(dto.getStoreId());
-                    list2.add(tFrameGoods);
-                }
-            }
-            if (!list1.isEmpty())frameGoodsService.updateBatchById(list1);
-            if (!list2.isEmpty())frameGoodsService.saveBatch(list2);
-        }
-
-        return ApiResult.success(dto.getId());
-    }
-    /**
-     * 添加镜片出库,入库,作废,退货
-     */
-    @ApiOperation(value = "添加镜片出库,入库,作废,退货")
-    @PostMapping(value = "/outBoundLens")
-    public ApiResult outBoundLens(@Validated @RequestBody TWarehousingLensDTO dto) {
-        // 获取当前用户
-        String username = JwtTokenUtils.getUsername();
-        dto.setCreateBy(username);
-        dto.setCreateTime(LocalDateTime.now());
-        dto.setType(WarehousingTypeEnum.LENS.getCode());
-        warehousingService.save(dto);
-        // 添加明细
-        List<TLensWarehousingDetail> frameWarehousingDetails = dto.getLensWarehousingDetails();
-        frameWarehousingDetails.forEach(detail -> {
-            detail.setWarehousingId(dto.getId());
-            detail.setCode(WarehousingConstant.OUT_BOUND+CodeGenerateUtils.generateVolumeSn());
-        });
-        if (dto.getStatus()==1||dto.getStatus()==3){
-            List<TLensGoods> list1 = new ArrayList<>();
-            for (TLensWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
-                TLensGoods one = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, frameWarehousingDetail.getSeriesId())
-                        .eq(TLensGoods::getRefractiveIndex, frameWarehousingDetail.getRefractiveIndex())
-                        .eq(TLensGoods::getLensType, frameWarehousingDetail.getType())
-                        .eq(TLensGoods::getBallMirror, frameWarehousingDetail.getBallMirror())
-                        .eq(TLensGoods::getColumnMirror, frameWarehousingDetail.getColumnMirror())
-                        .one();
-                if (one!=null){
-                    if (one.getTotal()-frameWarehousingDetail.getTotal()<0){
-                        return ApiResult.failed("库存不足");
-                    }
-                    // 减少对应库存
-                    one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
-                    list1.add(one);
-                }
-            }
-            if (!list1.isEmpty())lensGoodsService.updateBatchById(list1);
-        }
-        lensWarehousingDetailService.saveBatch(frameWarehousingDetails);
-
-        if (dto.getStatus()==2 || dto.getStatus()==4){
-            List<TLensGoods> list1 = new ArrayList<>();
-            List<TLensGoods> list2 = new ArrayList<>();
-            for (TLensWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
-                TLensGoods one = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, frameWarehousingDetail.getSeriesId())
-                        .eq(TLensGoods::getRefractiveIndex, frameWarehousingDetail.getRefractiveIndex())
-                        .eq(TLensGoods::getBallMirror, frameWarehousingDetail.getBallMirror())
-                        .eq(TLensGoods::getLensType, frameWarehousingDetail.getType())
-
-                        .eq(TLensGoods::getColumnMirror, frameWarehousingDetail.getColumnMirror())
-                        .one();
-                if (one!=null){
-                    // 增加对应库存
-                    one.setTotal(one.getTotal()+frameWarehousingDetail.getTotal());
-                    list1.add(one);
-                }else {
-                    // 新增
-                    TLensGoods tFrameGoods = new TLensGoods();
-                    tFrameGoods.setLensType(frameWarehousingDetail.getType());
-                    tFrameGoods.setSeriesId(frameWarehousingDetail.getSeriesId());
-                    tFrameGoods.setBallMirror(frameWarehousingDetail.getBallMirror());
-                    tFrameGoods.setColumnMirror(frameWarehousingDetail.getColumnMirror());
-                    tFrameGoods.setRefractiveIndex(frameWarehousingDetail.getRefractiveIndex());
-                    tFrameGoods.setTotal(frameWarehousingDetail.getTotal());
-                    tFrameGoods.setStoreId(dto.getStoreId());
-                    list2.add(tFrameGoods);
-                }
-            }
-            if (!list1.isEmpty())lensGoodsService.updateBatchById(list1);
-            if (!list2.isEmpty())lensGoodsService.saveBatch(list2);
-        }
-        return ApiResult.success(dto.getId());
-    }
-
-    /**
-     * 查询详情
-     */
-    @ApiOperation(value = "镜架查询详情")
-    @GetMapping(value = "/getDetailById")
-    public ApiResult<TWarehousingVO> getDetailById(@RequestParam Integer id) {
-        TWarehousing warehousing = warehousingService.getById(id);
-        TWarehousingVO vo = new TWarehousingVO();
-        BeanUtils.copyProperties(warehousing, vo);
-        List<TFrameWarehousingDetail> list = frameWarehousingDetailService.list(Wrappers.lambdaQuery(TFrameWarehousingDetail.class)
-                .eq(TFrameWarehousingDetail::getWarehousingId, id));
-        vo.setFrameWarehousingDetails(list);
-        // 统计数量
-        vo.setTotalNum(list.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum());
-        return ApiResult.success(vo);
-    }
-    @ApiOperation(value = "镜片查询详情")
-    @GetMapping(value = "/getDetailLensById")
-    public ApiResult<TWarehousingLensVO> getDetailLensById(@RequestParam Integer id) {
-        TWarehousing warehousing = warehousingService.getById(id);
-        TWarehousingLensVO vo = new TWarehousingLensVO();
-        BeanUtils.copyProperties(warehousing, vo);
-        List<TLensWarehousingDetail> list = lensWarehousingDetailService.list(Wrappers.lambdaQuery(TLensWarehousingDetail.class)
-                .eq(TLensWarehousingDetail::getWarehousingId, id));
-        vo.setLensWarehousingDetails(list);
-        // 统计数量
-        vo.setTotalNum(list.stream().mapToInt(TLensWarehousingDetail::getTotal).sum());
-        return ApiResult.success(vo);
-    }
-
-}
-

--
Gitblit v1.7.1