diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.java new file mode 100644 index 00000000..1c863764 --- /dev/null +++ b/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 { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper 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> maps); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml new file mode 100644 index 00000000..c238120e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + insert into crude_oil_storage_file (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppRest.java new file mode 100644 index 00000000..f4d243cc --- /dev/null +++ b/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> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = CrudeOilPriceRecordService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody CrudeOilPriceRecordDto dto){ + return CrudeOilPriceRecordService.save(dto); + } + + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppService.java new file mode 100644 index 00000000..8bc792f8 --- /dev/null +++ b/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 { + @Autowired + TankInformationAppMapper tankInformationMapper; + + public PagerVo listPageVo(PagerQuery pq) { + CrudeOilPriceRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo 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().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml index ec321e30..b819d398 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml @@ -5,11 +5,13 @@ + SELECT + * + FROM + supplier_information + + ${ew.sqlSegment} + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppRest.java new file mode 100644 index 00000000..b0c6983a --- /dev/null +++ b/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> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = RawSupplierInformationService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("查询数据的列表") + @PostMapping("/supplierList") + public ResultBean> typeList() { + ResultBean rb = ResultBean.fireFail(); + List 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); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/supplierinformation/SupplierInformationAppService.java new file mode 100644 index 00000000..4ebe32db --- /dev/null +++ b/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 { + + + public PagerVo listPageVo(PagerQuery pq) { + SupplierInformationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getSupplierName())){ + qw.like("supplierName",query.getSupplierName()); + } + if(StringUtils.isNotBlank(query.getSupplierCode())){ + qw.like("supplierCode",query.getSupplierCode()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List 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().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.java new file mode 100644 index 00000000..8dc0d166 --- /dev/null +++ b/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 { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper 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); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.xml new file mode 100644 index 00000000..8a8e851d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppRest.java new file mode 100644 index 00000000..5054e07f --- /dev/null +++ b/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); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/sysuser/CyfSysUserAppService.java new file mode 100644 index 00000000..e2fde098 --- /dev/null +++ b/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 { + + + + 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().eq("userName",userName).eq("password",password)); + } + public SysUser getUserById(String id){ + return baseMapper.selectOne(new QueryWrapper().eq("id",id)); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/config/SaTokenConfigure.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/config/SaTokenConfigure.java index e52ce124..3940ea9c 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/config/SaTokenConfigure.java +++ b/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"); } } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java index 68b8b3db..917c0181 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/sysuser/CyfSysUserRest.java +++ b/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}")