app整合satoken登录认证 原油库存总价值 原油单价 入库供应商选择

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.cyf.app.crudeoilpricerecord;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecord;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Mapper
+public interface CrudeOilPriceRecordAppMapper extends BaseMapper<CrudeOilPriceRecord> {
+    IPage<CrudeOilPriceRecordVo> selectPageVo(IPage<CrudeOilPriceRecord> page, @Param(Constants.WRAPPER) Wrapper<CrudeOilPriceRecord> qw);
+    @Select("select * from crude_oil_price_record where typeSid=#{typeSid} order by createTime desc limit 1")
+    CrudeOilPriceRecord getCrudeByTypeSid(@Param("typeSid")String typeSid);
+    void insertCrudeOilFiles(List<Map<String, String>> maps);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.cyf.app.crudeoilpricerecord.CrudeOilPriceRecordAppMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
+        SELECT
+        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        s.supplierName as supplierName
+        FROM
+        crude_oil_storage c
+        left join tank_information t on t.sid=c.tankSid
+        left join  crude_oil_type_information i on i.sid =t.crudeSid
+        left join supplier_information s on s.sid =c.supplierSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <insert id="insertCrudeOilFiles">
+        insert into  crude_oil_storage_file (sid, url, mainSid) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sid,jdbcType=VARCHAR},
+            #{item.url,jdbcType=VARCHAR},
+            #{item.mainSid,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+</mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppRest.java

@@ -0,0 +1,42 @@
+package com.yxt.supervise.cyf.app.crudeoilpricerecord;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordDto;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordQuery;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo;
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:38
+ */
+@Api(tags = "原油价格记录")
+@RestController
+@RequestMapping("cyf/app/crudeprice")
+public class CrudeOilPriceRecordAppRest {
+    @Autowired
+    CrudeOilPriceRecordAppService CrudeOilPriceRecordService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<CrudeOilPriceRecordVo>> listPage(@RequestBody PagerQuery<CrudeOilPriceRecordQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<CrudeOilPriceRecordVo> pv = CrudeOilPriceRecordService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save (@RequestBody CrudeOilPriceRecordDto dto){
+        return CrudeOilPriceRecordService.save(dto);
+    }
+
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppService.java

@@ -0,0 +1,63 @@
+package com.yxt.supervise.cyf.app.crudeoilpricerecord;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecord;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordDto;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordQuery;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo;
+import com.yxt.supervise.cyf.app.tankinformation.TankInformationAppMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Service
+public class CrudeOilPriceRecordAppService extends MybatisBaseService<CrudeOilPriceRecordAppMapper, CrudeOilPriceRecord> {
+    @Autowired
+    TankInformationAppMapper tankInformationMapper;
+
+    public PagerVo<CrudeOilPriceRecordVo> listPageVo(PagerQuery<CrudeOilPriceRecordQuery> pq) {
+        CrudeOilPriceRecordQuery query = pq.getParams();
+        QueryWrapper<CrudeOilPriceRecord> qw = new QueryWrapper<>();
+        IPage<CrudeOilPriceRecord> page = PagerUtil.queryToPage(pq);
+        IPage<CrudeOilPriceRecordVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<CrudeOilPriceRecordVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    @Transactional
+    public ResultBean save(CrudeOilPriceRecordDto dto){
+
+        ResultBean rb=new ResultBean();
+        CrudeOilPriceRecord entity=new CrudeOilPriceRecord();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("新增成功");
+    }
+    public ResultBean update (CrudeOilPriceRecordDto dto){
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        CrudeOilPriceRecord entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改成功");
+    }
+    public CrudeOilPriceRecord getCrudeByTypeSid(String sid){
+        CrudeOilPriceRecord CrudeOilPriceRecord=baseMapper.getCrudeByTypeSid(sid);
+        return  CrudeOilPriceRecord;
+    }
+    public ResultBean del(String sid){
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<CrudeOilPriceRecord>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml

@@ -5,11 +5,13 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory
+        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        s.supplierName as supplierName
         FROM
         crude_oil_storage c
         left join tank_information t on t.sid=c.tankSid
         left join  crude_oil_type_information i on i.sid =t.crudeSid
+        left join supplier_information s on s.sid =c.supplierSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiltypeinformation/CrudeOilTypeInformationAppService.java

@@ -9,10 +9,17 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecord;
+import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordDto;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformation;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationQuery;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo;
+import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
+import com.yxt.supervise.cyf.app.crudeoilpricerecord.CrudeOilPriceRecordAppMapper;
+import com.yxt.supervise.cyf.app.crudeoilpricerecord.CrudeOilPriceRecordAppService;
+import com.yxt.supervise.cyf.app.tankinformation.TankInformationAppService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,7 +30,12 @@ import java.util.List;
  */
 @Service
 public class CrudeOilTypeInformationAppService extends MybatisBaseService<CrudeOilTypeInformationAppMapper, CrudeOilTypeInformation> {
-
+    @Autowired
+    CrudeOilPriceRecordAppService crudeOilPriceRecordService;
+    @Autowired
+    CrudeOilPriceRecordAppMapper crudeOilPriceRecordMapper;
+    @Autowired
+    TankInformationAppService tankInformationService;
 
     public PagerVo<CrudeOilTypeInformationVo> listPageVo(PagerQuery<CrudeOilTypeInformationQuery> pq) {
         CrudeOilTypeInformationQuery query = pq.getParams();
@@ -54,6 +66,12 @@ public class CrudeOilTypeInformationAppService extends MybatisBaseService<CrudeO
         }
         CrudeOilTypeInformation entity=new CrudeOilTypeInformation();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        //新增价格记录
+        CrudeOilPriceRecordDto dto1=new CrudeOilPriceRecordDto();
+        dto1.setTypeSid(entity.getSid());
+        dto1.setPrice(entity.getPrice());
+        dto1.setOldPrice(entity.getPrice());
+        crudeOilPriceRecordService.save(dto1);
         baseMapper.insert(entity);
         return rb.success().setMsg("新增成功");
     }
@@ -62,7 +80,39 @@ public class CrudeOilTypeInformationAppService extends MybatisBaseService<CrudeO
         String dtoSid = dto.getSid();
         CrudeOilTypeInformation entity=fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        CrudeOilTypeInformation type=baseMapper.selectOne(new QueryWrapper<CrudeOilTypeInformation>().eq("sid",dtoSid));
+        CrudeOilPriceRecord crude=crudeOilPriceRecordService.getCrudeByTypeSid(dto.getSid());
+        CrudeOilPriceRecord price=new CrudeOilPriceRecord();
+        //新增价格记录
+        if(null==crude){
+            CrudeOilPriceRecordDto dto1=new CrudeOilPriceRecordDto();
+            dto1.setTypeSid(entity.getSid());
+            dto1.setPrice(type.getPrice());
+            dto1.setOldPrice(type.getPrice());
+            BeanUtil.copyProperties(dto1, price, "id", "sid");
+            crudeOilPriceRecordMapper.insert(price);
+            //以防两次创建时间相同 停一毫秒
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if(type.getPrice()!=dto.getPrice()){
+            CrudeOilPriceRecordDto dto1=new CrudeOilPriceRecordDto();
+            dto1.setTypeSid(entity.getSid());
+            dto1.setPrice(entity.getPrice());
+            dto1.setOldPrice(type.getPrice());
+            dto1.setPSid(crude==null? price.getSid() : crude.getSid());
+            crudeOilPriceRecordService.save(dto1);
+        }
         baseMapper.updateById(entity);
+        //计算库存总价值
+        List<TankInformation> tank=tankInformationService.list(new QueryWrapper<TankInformation>().eq("crudeSid",dto.getSid()));
+        for(TankInformation ta :tank){
+            ta.setTotalValue(dto.getPrice()*ta.getInventory());
+        }
+        tankInformationService.updateBatchById(tank);
         return rb.success().setMsg("修改成功");
     }
     public ResultBean getCrudeBySid(String sid){

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppMapper.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.cyf.app.supplierinformation;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformation;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Mapper
+public interface SupplierInformationAppMapper extends BaseMapper<SupplierInformation> {
+    IPage<SupplierInformationVo> selectPageVo(IPage<SupplierInformation> page, @Param(Constants.WRAPPER) Wrapper<SupplierInformation> qw);
+    @Select("select * from supplier_information")
+    List<SupplierInformationVo> supplierList();
+    @Select("select * from supplier_information where sid=#{sid}")
+    SupplierInformation getSupplierBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.cyf.app.supplierinformation.SupplierInformationAppMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo">
+        SELECT
+        *
+        FROM
+        supplier_information
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppRest.java

@@ -0,0 +1,61 @@
+package com.yxt.supervise.cyf.app.supplierinformation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationDto;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationQuery;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo;
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:38
+ */
+@Api(tags = "供应商信息")
+@RestController
+@RequestMapping("cyf/app/supplier")
+public class SupplierInformationAppRest {
+    @Autowired
+    SupplierInformationAppService RawSupplierInformationService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SupplierInformationVo>> listPage(@RequestBody PagerQuery<SupplierInformationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<SupplierInformationVo> pv = RawSupplierInformationService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("查询数据的列表")
+    @PostMapping("/supplierList")
+    public ResultBean<PagerVo<SupplierInformationVo>> typeList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<SupplierInformationVo> pv = RawSupplierInformationService.supplierList();
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save (@RequestBody SupplierInformationDto dto){
+        return RawSupplierInformationService.save(dto);
+    }
+    @ApiOperation("修改")
+    @PostMapping("/update")
+    public ResultBean update (@RequestBody SupplierInformationDto dto){
+        return RawSupplierInformationService.update(dto);
+    }
+    @ApiOperation("根据sid查询")
+    @GetMapping("/getSupplierBySid/{sid}")
+    public ResultBean getSupplierBySid(@PathVariable String sid){
+        return RawSupplierInformationService.getSupplierBySid(sid);
+    }
+    @ApiOperation("删除")
+    @DeleteMapping("/delete/{sid}")
+    public ResultBean delete(@PathVariable String sid ){
+        return RawSupplierInformationService.del(sid);
+    }
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppService.java

@@ -0,0 +1,70 @@
+package com.yxt.supervise.cyf.app.supplierinformation;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformation;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationDto;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationQuery;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Service
+public class SupplierInformationAppService extends MybatisBaseService<SupplierInformationAppMapper, SupplierInformation> {
+
+
+    public PagerVo<SupplierInformationVo> listPageVo(PagerQuery<SupplierInformationQuery> pq) {
+        SupplierInformationQuery query = pq.getParams();
+        QueryWrapper<SupplierInformation> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getSupplierName())){
+            qw.like("supplierName",query.getSupplierName());
+        }
+        if(StringUtils.isNotBlank(query.getSupplierCode())){
+            qw.like("supplierCode",query.getSupplierCode());
+        }
+        IPage<SupplierInformation> page = PagerUtil.queryToPage(pq);
+        IPage<SupplierInformationVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<SupplierInformationVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<SupplierInformationVo> supplierList() {
+        return baseMapper.supplierList();
+    }
+    public ResultBean save(SupplierInformationDto dto){
+        ResultBean rb=new ResultBean();
+        SupplierInformation entity=new SupplierInformation();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("新增成功");
+    }
+    public ResultBean update (SupplierInformationDto dto){
+        ResultBean rb=new ResultBean();
+        String dtoSid = dto.getSid();
+        SupplierInformation entity=fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+        return rb.success().setMsg("修改成功");
+    }
+    public ResultBean getSupplierBySid(String sid){
+        ResultBean rb=new ResultBean();
+        SupplierInformation RawSupplierInformation=baseMapper.getSupplierBySid(sid);
+        return  rb.success().setData(RawSupplierInformation);
+    }
+    public ResultBean del(String sid){
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<SupplierInformation>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.cyf.app.sysuser;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformation;
+import com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo;
+import com.yxt.supervise.cyf.api.sysuser.SysUser;
+import com.yxt.supervise.cyf.api.sysuser.SysUserVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Mapper
+public interface CyfSysUserAppMapper extends BaseMapper<SysUser> {
+    IPage<SupplierInformationVo> selectPageVo(IPage<SupplierInformation> page, @Param(Constants.WRAPPER) Wrapper<SupplierInformation> qw);
+    @Select("select count(userName) as userName from sys_user where userName=#{userName} and password=#{password}")
+    SysUserVo getUser(@Param("userName")String userName, @Param("password")String password);
+    @Select("select * from supplier_information where sid=#{sid}")
+    SupplierInformation getSupplierBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.cyf.app.sysuser.CyfSysUserAppMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.supplierinformation.SupplierInformationVo">
+        SELECT
+        *
+        FROM
+        supplier_information
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppRest.java

@@ -0,0 +1,52 @@
+package com.yxt.supervise.cyf.app.sysuser;
+
+import cn.dev33.satoken.stp.SaTokenInfo;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.cyf.api.sysuser.SysUser;
+import com.yxt.supervise.cyf.api.sysuser.SysUserVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:38
+ */
+@Api(tags = "用户")
+@RestController
+@RequestMapping("cyf/app/sys")
+public class CyfSysUserAppRest {
+
+    @Autowired
+    CyfSysUserAppService sysUserService;
+
+    @ApiOperation("登录")
+    @PostMapping("/doLogin")
+    public ResultBean doLogin(@RequestBody SysUser user) {
+        ResultBean rb=new ResultBean();
+        SysUserVo sysUserVo=sysUserService.getUser(user.getUserName(), user.getPassword());
+        if(sysUserVo.getUserName().equals("1")){
+            SysUser sysUser=sysUserService.getSysUser(user.getUserName(), user.getPassword());
+            StpUtil.login(sysUser.getId());
+            SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
+            System.out.println(StpUtil.getTokenName());
+            System.out.println(StpUtil.getTokenValue());
+            return rb.success().setData(tokenInfo);
+            //return SaResult.ok("登录成功");
+        } else if (sysUserVo.getUserName().equals("0")) {
+            return rb.setMsg("账户不存在或者密码不正确");
+        }
+        return rb.setMsg("登录失败");
+    }
+    @ApiOperation("根据id查询用户信息")
+    @GetMapping("/getUserById/{id}")
+    public ResultBean getUserById(@PathVariable String  id) {
+        ResultBean rb=new ResultBean();
+        SysUser sysUser=sysUserService.getUserById(id);
+        return rb.success().setData(sysUser);
+    }
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppService.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.cyf.app.sysuser;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.cyf.api.sysuser.SysUser;
+import com.yxt.supervise.cyf.api.sysuser.SysUserVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Service
+public class CyfSysUserAppService extends MybatisBaseService<CyfSysUserAppMapper, SysUser> {
+
+
+
+    public SysUserVo getUser(String userName,String password){
+        ResultBean rb=new ResultBean();
+        SysUserVo sysUserVo=baseMapper.getUser(userName,password);
+        return  sysUserVo;
+    }
+    public SysUser getSysUser(String userName,String password){
+        return baseMapper.selectOne(new QueryWrapper<SysUser>().eq("userName",userName).eq("password",password));
+    }
+    public SysUser getUserById(String id){
+        return baseMapper.selectOne(new QueryWrapper<SysUser>().eq("id",id));
+    }
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/config/SaTokenConfigure.java

@@ -19,6 +19,6 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
         registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
                 .addPathPatterns("/**")
-                .excludePathPatterns("/cyf/sys/doLogin");
+                .excludePathPatterns("/cyf/sys/doLogin").excludePathPatterns("/cyf/app/sys/doLogin");
     }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java

@@ -29,7 +29,8 @@ public class CyfSysUserRest {
 
     @ApiOperation("登录")
     @PostMapping("/doLogin")
-    public SaResult doLogin(@RequestBody SysUser user) {
+    public ResultBean doLogin(@RequestBody SysUser user) {
+        ResultBean rb =new ResultBean();
         SysUserVo sysUserVo=sysUserService.getUser(user.getUserName(), user.getPassword());
         if(sysUserVo.getUserName().equals("1")){
             SysUser sysUser=sysUserService.getSysUser(user.getUserName(), user.getPassword());
@@ -37,12 +38,12 @@ public class CyfSysUserRest {
             SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
             System.out.println(StpUtil.getTokenName());
             System.out.println(StpUtil.getTokenValue());
-            return SaResult.data(tokenInfo);
+            return rb.success().setData(tokenInfo);
             //return SaResult.ok("登录成功");
         } else if (sysUserVo.getUserName().equals("0")) {
-            return SaResult.error("账户不存在或者密码不正确");
+            return rb.setMsg("账户不存在或者密码不正确");
         }
-        return SaResult.error("登录失败");
+        return rb.setMsg("登录失败");
     }
     @ApiOperation("根据id查询用户信息")
     @GetMapping("/getUserById/{id}")