无关风月
2024-12-16 769a7715ab112b5940fb50817981221dda8999bd
代码
12个文件已修改
6个文件已添加
312 ■■■■■ 已修改文件
manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TStoreController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/mapper/RegionMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/mapper/TLensSeriesMapper.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/model/Region.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/model/TLensSeries.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/query/TLensSeriesQuery.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/ITRegionService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/TLensSeriesService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/TOptometristService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/service/impl/TRegionServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/vo/TLensSeriesVO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/resources/mapping/TLensSeriesMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/resources/mapping/TOptometristMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TLensSeriesController.java
@@ -1,9 +1,20 @@
package com.jilongda.manage.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLensSeries;
import com.jilongda.manage.model.TOptometrist;
import com.jilongda.manage.query.TLensSeriesQuery;
import com.jilongda.manage.query.TOptometristQuery;
import com.jilongda.manage.service.TLensSeriesService;
import com.jilongda.manage.vo.TLensSeriesVO;
import com.jilongda.manage.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.*;
/**
 * <p>
@@ -13,9 +24,50 @@
 * @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();
    }
}
manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
@@ -34,7 +34,7 @@
    @ApiOperation(value = "验光师列表")
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TOptometristVO>> pageList(@RequestBody TOptometristQuery query) {
        PageInfo<TOptometristVO> optometristVOPageInfo = optometristService.pageList(query);
        PageInfo<TOptometristVO> optometristVOPageInfo = optometristService.pageList1(query);
        return ApiResult.success(optometristVOPageInfo);
    }
manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
@@ -3,8 +3,10 @@
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.Region;
import com.jilongda.manage.model.TStore;
import com.jilongda.manage.query.TStoreQuery;
import com.jilongda.manage.service.ITRegionService;
import com.jilongda.manage.service.TStoreService;
import com.jilongda.manage.utils.LoginInfoUtil;
import com.jilongda.manage.vo.TStoreVO;
@@ -34,6 +36,8 @@
    private TStoreService storeService;
    @Autowired
    private LoginInfoUtil loginInfoUtil;
    @Autowired
    private ITRegionService regionService;
    /**
     * 获取门店列表
@@ -42,12 +46,16 @@
    @PostMapping(value = "/pageList")
    public ApiResult<PageInfo<TStoreVO>> pageList(@RequestBody TStoreQuery query) {
        Integer userType = loginInfoUtil.getLoginUser().getUserType();
        if(Objects.equals(userType,2)){
        if(!Objects.equals(userType,1)){
            query.setStatus(1);
        }
        return ApiResult.success(storeService.pageList(query));
    }
    @ApiOperation(value = "省市区三级联动 获取省传0 市区传上级id")
    @GetMapping(value = "/add")
    public ApiResult<List<Region>> add(Integer parentId) {
        return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,parentId).list());
    }
    /**
     * 添加门店
     */
manage/src/main/java/com/jilongda/manage/mapper/RegionMapper.java
New file
@@ -0,0 +1,17 @@
package com.jilongda.manage.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jilongda.manage.model.Region;
/**
 * <p>
 * 省市区三级联动 Mapper 接口
 * </p>
 *
 * @author 吕雪
 * @since 2019-12-30
 */
public interface RegionMapper extends BaseMapper<Region> {
}
manage/src/main/java/com/jilongda/manage/mapper/TLensSeriesMapper.java
@@ -1,7 +1,15 @@
package com.jilongda.manage.mapper;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLensSeries;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jilongda.manage.query.TLensSeriesQuery;
import com.jilongda.manage.query.TOptometristQuery;
import com.jilongda.manage.vo.TLensSeriesVO;
import com.jilongda.manage.vo.TOptometristVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * <p>
@@ -12,5 +20,5 @@
 * @since 2024-12-09
 */
public interface TLensSeriesMapper extends BaseMapper<TLensSeries> {
    List<TLensSeriesVO> pageList(@Param("query")TLensSeriesQuery query, @Param("pageInfo")PageInfo<TLensSeriesVO> pageInfo);
}
manage/src/main/java/com/jilongda/manage/mapper/TOptometristMapper.java
@@ -32,6 +32,7 @@
     * @param pageInfo
     * @return
     */
    List<TOptometristVO> pageList(@Param("query") TOptometristQuery query, @Param("pageInfo")PageInfo<TOptometristVO> pageInfo);
    List<TOptometristVO> pageList1(@Param("query") TOptometristQuery query, @Param("pageInfo")PageInfo<TOptometristVO> pageInfo);
    List<TOptometryVO> pageList(@Param("query") TOptometryQuery query, @Param("pageInfo")PageInfo<TOptometryVO> pageInfo);
}
manage/src/main/java/com/jilongda/manage/model/Region.java
New file
@@ -0,0 +1,57 @@
package com.jilongda.manage.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
 * 行政区域数据
 *
 * @author pzb
 * @Date 2022/2/9 10:00
 */
@Data
@TableName("t_region")
@ApiModel(value = "省市区实体")
public class Region {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 城市名称
     */
    @TableField("name")
    @ApiModelProperty("省/市 名称")
    private String name;
    /**
     * 城市code
     */
    @TableField("code")
    @ApiModelProperty("省/市 编码")
    private String code;
    /**
     * 父级id
     */
    @TableField("parent_id")
    private Integer parentId;
    /**
     * 子集
     */
    @TableField(exist = false)
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    @ApiModelProperty("子集")
    private List<Region> children = new ArrayList<>();
}
manage/src/main/java/com/jilongda/manage/model/TLensSeries.java
@@ -48,16 +48,19 @@
    @ApiModelProperty(value = "库存类型 1库存 2非库存")
    @TableField("type")
    private Integer type;
    @ApiModelProperty(value = "状态 1启用2禁用")
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "球面")
    @ApiModelProperty(value = "球面 refractiveIndex=折射率 cost=成本 sales售价 例:[{\"refractiveIndex\":\"5\",\"cost\":\"20\",\"sales\":\"2\"}]")
    @TableField("sphere")
    private String sphere;
    @ApiModelProperty(value = "非球面")
    @ApiModelProperty(value = "非球面 refractiveIndex=折射率 cost=成本 sales售价 例:[{\"refractiveIndex\":\"5\",\"cost\":\"20\",\"sales\":\"2\"}]")
    @TableField("asphericSurface")
    private String asphericSurface;
    @ApiModelProperty(value = "双非")
    @ApiModelProperty(value = "双非 refractiveIndex=折射率 cost=成本 sales售价 例:[{\"refractiveIndex\":\"5\",\"cost\":\"20\",\"sales\":\"2\"}]")
    @TableField("doubleNon")
    private String doubleNon;
manage/src/main/java/com/jilongda/manage/query/TLensSeriesQuery.java
New file
@@ -0,0 +1,18 @@
package com.jilongda.manage.query;
import com.jilongda.common.pojo.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "验光师查询条件")
public class TLensSeriesQuery extends BasePage {
    @ApiModelProperty(value = "品牌id")
    private Integer brandId;
    @ApiModelProperty(value = "库存类型 1库存 2非库存")
    private Integer type;
}
manage/src/main/java/com/jilongda/manage/service/ITRegionService.java
New file
@@ -0,0 +1,17 @@
package com.jilongda.manage.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jilongda.manage.model.Region;
/**
 * <p>
 * 省市区三级联动 服务类
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-02
 */
public interface ITRegionService extends IService<Region> {
}
manage/src/main/java/com/jilongda/manage/service/TLensSeriesService.java
@@ -1,7 +1,10 @@
package com.jilongda.manage.service;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLensSeries;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jilongda.manage.query.TLensSeriesQuery;
import com.jilongda.manage.vo.TLensSeriesVO;
/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface TLensSeriesService extends IService<TLensSeries> {
    PageInfo<TLensSeriesVO> pageList(TLensSeriesQuery query);
}
manage/src/main/java/com/jilongda/manage/service/TOptometristService.java
@@ -19,4 +19,8 @@
public interface TOptometristService extends IService<TOptometrist> {
    PageInfo<TOptometryVO> pageList(TOptometryQuery query);
    PageInfo<TOptometristVO> pageList1(TOptometristQuery query);
    Boolean upAndDown(Integer id, Integer status);
}
manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java
@@ -1,10 +1,16 @@
package com.jilongda.manage.service.impl;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TLensSeries;
import com.jilongda.manage.mapper.TLensSeriesMapper;
import com.jilongda.manage.query.TLensSeriesQuery;
import com.jilongda.manage.service.TLensSeriesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.manage.vo.TLensSeriesVO;
import com.jilongda.manage.vo.TOptometristVO;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TLensSeriesServiceImpl extends ServiceImpl<TLensSeriesMapper, TLensSeries> implements TLensSeriesService {
    @Override
    public PageInfo<TLensSeriesVO> pageList(TLensSeriesQuery query) {
        PageInfo<TLensSeriesVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TLensSeriesVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}
manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
@@ -43,7 +43,14 @@
    public PageInfo<TOptometryVO> pageList(TOptometryQuery query) {
        PageInfo<TOptometryVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TOptometryVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
    @Override
    public PageInfo<TOptometristVO> pageList1(TOptometristQuery query) {
        PageInfo<TOptometristVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TOptometristVO> list = this.baseMapper.pageList1(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
manage/src/main/java/com/jilongda/manage/service/impl/TRegionServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.jilongda.manage.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.manage.mapper.RegionMapper;
import com.jilongda.manage.model.Region;
import com.jilongda.manage.service.ITRegionService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 省市区三级联动 服务实现类
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-02
 */
@Service
public class TRegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements ITRegionService {
}
manage/src/main/java/com/jilongda/manage/vo/TLensSeriesVO.java
New file
@@ -0,0 +1,20 @@
package com.jilongda.manage.vo;
import com.jilongda.manage.model.TLensSeries;
import com.jilongda.manage.model.TOptometrist;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "镜片系列VO")
public class TLensSeriesVO extends TLensSeries {
    @ApiModelProperty(value = "品牌名称")
    private String brandName;
    @ApiModelProperty(value = "球/非")
    private String typeName;
    @ApiModelProperty(value = "折射率")
    private String refractiveIndex;
}
manage/src/main/resources/mapping/TLensSeriesMapper.xml
@@ -17,11 +17,29 @@
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
        <result column="status" property="status" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, brandId, supplierId, type, sphere, asphericSurface, doubleNon, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
    <select id="pageList" resultType="com.jilongda.manage.vo.TLensSeriesVO">
        select t1.*,t2.name as brandName
        from t_lens_series t1
        left join t_brand t2 on t1.brandId = t2.id
              where 1=1
              <if test="query.brandId != null and query.brandId != ''">
                  and t1.brandId = #{query.brandId}
              </if>
              <if test="query.type != null and query.type != ''">
                  and t1.type = #{query.type}
              </if>
              and t2.type = 2
              and t2.status = 1
        and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        and t2.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        order by t1.id asc
    </select>
</mapper>
manage/src/main/resources/mapping/TOptometristMapper.xml
@@ -57,5 +57,25 @@
        </where>
        ORDER BY createTime DESC
    </select>
    <select id="pageList1" resultType="com.jilongda.manage.vo.TOptometristVO">
        select <include refid="Base_Column_List"></include>
        from t_optometrist
        <where>
            <if test="query.name != null and query.name != ''">
                and `name` like concat('%',#{query.name},'%')
            </if>
            <if test="query.phone != null and query.phone != ''">
                and phone like concat('%',#{query.phone},'%')
            </if>
            <if test="query.status != null">
                and status = #{query.status}
            </if>
            <if test="query.storeId != null">
                and storeId = #{query.storeId}
            </if>
            and isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY createTime DESC
    </select>
</mapper>