diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/AbucoderWxuserController.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/AbucoderWxuserController.java index 5a1385b..2cf4348 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/AbucoderWxuserController.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/AbucoderWxuserController.java @@ -1,29 +1,22 @@ package com.ruoyi.abuwx.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.abuwx.service.IAbucoderWxuserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.abuwx.domain.AbucoderWxuser; -import com.ruoyi.abuwx.service.IAbucoderWxuserService; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.domain.entity.AbucoderWxuser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 微信用户Controller - * + * * @author 阿卜Coder QQ932696181 * @date 2024-04-07 */ @@ -37,7 +30,6 @@ public class AbucoderWxuserController extends BaseController /** * 查询微信用户列表 */ - @PreAuthorize("@ss.hasPermi('abuwx:wxuser:list')") @GetMapping("/list") public TableDataInfo list(AbucoderWxuser abucoderWxuser) { @@ -49,7 +41,6 @@ public class AbucoderWxuserController extends BaseController /** * 导出微信用户列表 */ - @PreAuthorize("@ss.hasPermi('abuwx:wxuser:export')") @Log(title = "微信用户", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, AbucoderWxuser abucoderWxuser) @@ -62,7 +53,6 @@ public class AbucoderWxuserController extends BaseController /** * 获取微信用户详细信息 */ - @PreAuthorize("@ss.hasPermi('abuwx:wxuser:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +62,6 @@ public class AbucoderWxuserController extends BaseController /** * 新增微信用户 */ - @PreAuthorize("@ss.hasPermi('abuwx:wxuser:add')") @Log(title = "微信用户", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody AbucoderWxuser abucoderWxuser) @@ -83,7 +72,6 @@ public class AbucoderWxuserController extends BaseController /** * 修改微信用户 */ - @PreAuthorize("@ss.hasPermi('abuwx:wxuser:edit')") @Log(title = "微信用户", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AbucoderWxuser abucoderWxuser) @@ -94,7 +82,6 @@ public class AbucoderWxuserController extends BaseController /** * 删除微信用户 */ - @PreAuthorize("@ss.hasPermi('abuwx:wxuser:remove')") @Log(title = "微信用户", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbMaintenanceInformationController.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbMaintenanceInformationController.java index a97fde8..b265dc6 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbMaintenanceInformationController.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbMaintenanceInformationController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -31,7 +30,6 @@ public class WbMaintenanceInformationController extends BaseController /** * 查询维保记录列表 */ - @PreAuthorize("@ss.hasPermi('abuwx:information:list')") @GetMapping("/list") public TableDataInfo list(WbMaintenanceInformation wbMaintenanceInformation) { @@ -43,7 +41,6 @@ public class WbMaintenanceInformationController extends BaseController /** * 导出维保记录列表 */ - @PreAuthorize("@ss.hasPermi('abuwx:information:export')") @Log(title = "维保记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, WbMaintenanceInformation wbMaintenanceInformation) @@ -56,7 +53,6 @@ public class WbMaintenanceInformationController extends BaseController /** * 获取维保记录详细信息 */ - @PreAuthorize("@ss.hasPermi('abuwx:information:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -66,7 +62,6 @@ public class WbMaintenanceInformationController extends BaseController /** * 新增维保记录 */ - @PreAuthorize("@ss.hasPermi('abuwx:information:add')") @Log(title = "维保记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody WbMaintenanceInformation wbMaintenanceInformation) @@ -77,7 +72,6 @@ public class WbMaintenanceInformationController extends BaseController /** * 修改维保记录 */ - @PreAuthorize("@ss.hasPermi('abuwx:information:edit')") @Log(title = "维保记录", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody WbMaintenanceInformation wbMaintenanceInformation) @@ -88,7 +82,6 @@ public class WbMaintenanceInformationController extends BaseController /** * 删除维保记录 */ - @PreAuthorize("@ss.hasPermi('abuwx:information:remove')") @Log(title = "维保记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbProjectController.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbProjectController.java index d83790c..31ea204 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbProjectController.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/controller/WbProjectController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -31,7 +30,6 @@ public class WbProjectController extends BaseController /** * 查询项目管理列表 */ - @PreAuthorize("@ss.hasPermi('abuwx:project:list')") @GetMapping("/list") public TableDataInfo list(WbProject wbProject) { @@ -43,7 +41,6 @@ public class WbProjectController extends BaseController /** * 导出项目管理列表 */ - @PreAuthorize("@ss.hasPermi('abuwx:project:export')") @Log(title = "项目管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, WbProject wbProject) @@ -56,7 +53,6 @@ public class WbProjectController extends BaseController /** * 获取项目管理详细信息 */ - @PreAuthorize("@ss.hasPermi('abuwx:project:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -66,7 +62,6 @@ public class WbProjectController extends BaseController /** * 新增项目管理 */ - @PreAuthorize("@ss.hasPermi('abuwx:project:add')") @Log(title = "项目管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody WbProject wbProject) @@ -77,7 +72,6 @@ public class WbProjectController extends BaseController /** * 修改项目管理 */ - @PreAuthorize("@ss.hasPermi('abuwx:project:edit')") @Log(title = "项目管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody WbProject wbProject) @@ -88,7 +82,6 @@ public class WbProjectController extends BaseController /** * 删除项目管理 */ - @PreAuthorize("@ss.hasPermi('abuwx:project:remove')") @Log(title = "项目管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbMaintenanceInformation.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbMaintenanceInformation.java index bab6dfc..9ef084d 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbMaintenanceInformation.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbMaintenanceInformation.java @@ -1,5 +1,6 @@ package com.ruoyi.abuwx.domain; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -7,10 +8,11 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 维保记录对象 wb_maintenance_information - * + * * @author ruoyi * @date 2024-04-09 */ +@Data public class WbMaintenanceInformation extends BaseEntity { private static final long serialVersionUID = 1L; @@ -26,6 +28,10 @@ public class WbMaintenanceInformation extends BaseEntity @Excel(name = "项目名称") private String projectName; + /** 维保类型 */ + @Excel(name = "维保类型") + private String maintenanceType; + /** 图片 */ @Excel(name = "图片") private String imageUrl; @@ -34,48 +40,48 @@ public class WbMaintenanceInformation extends BaseEntity @Excel(name = "附件") private String fileUrl; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setProjectId(Long projectId) + public void setProjectId(Long projectId) { this.projectId = projectId; } - public Long getProjectId() + public Long getProjectId() { return projectId; } - public void setProjectName(String projectName) + public void setProjectName(String projectName) { this.projectName = projectName; } - public String getProjectName() + public String getProjectName() { return projectName; } - public void setImageUrl(String imageUrl) + public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } - public String getImageUrl() + public String getImageUrl() { return imageUrl; } - public void setFileUrl(String fileUrl) + public void setFileUrl(String fileUrl) { this.fileUrl = fileUrl; } - public String getFileUrl() + public String getFileUrl() { return fileUrl; } @@ -86,6 +92,7 @@ public class WbMaintenanceInformation extends BaseEntity .append("id", getId()) .append("projectId", getProjectId()) .append("projectName", getProjectName()) + .append("maintenanceType", getMaintenanceType()) .append("imageUrl", getImageUrl()) .append("fileUrl", getFileUrl()) .append("createBy", getCreateBy()) diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbProject.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbProject.java index cb7790e..ea3e50b 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbProject.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/domain/WbProject.java @@ -65,6 +65,11 @@ public class WbProject extends BaseEntity .append("id", getId()) .append("projectName", getProjectName()) .append("projectOverview", getProjectOverview()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) .toString(); } } diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/AbucoderWxuserMapper.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/AbucoderWxuserMapper.java index 9f464a7..bb83137 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/AbucoderWxuserMapper.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/AbucoderWxuserMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.abuwx.mapper; -import com.ruoyi.abuwx.domain.AbucoderWxuser; +import com.ruoyi.common.core.domain.entity.AbucoderWxuser; import java.util.List; diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/WbMaintenanceInformationMapper.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/WbMaintenanceInformationMapper.java index 3d1d4c1..015f90c 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/WbMaintenanceInformationMapper.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/mapper/WbMaintenanceInformationMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.abuwx.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.abuwx.domain.WbMaintenanceInformation; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * @author ruoyi * @date 2024-04-09 */ -public interface WbMaintenanceInformationMapper +public interface WbMaintenanceInformationMapper extends BaseMapper { /** * 查询维保记录 diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IAbucoderWxuserService.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IAbucoderWxuserService.java index 45e35b1..1eb2585 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IAbucoderWxuserService.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IAbucoderWxuserService.java @@ -1,6 +1,6 @@ package com.ruoyi.abuwx.service; -import com.ruoyi.abuwx.domain.AbucoderWxuser; +import com.ruoyi.common.core.domain.entity.AbucoderWxuser; import java.util.List; diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IWbMaintenanceInformationService.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IWbMaintenanceInformationService.java index ba1b34e..f03996b 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IWbMaintenanceInformationService.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/IWbMaintenanceInformationService.java @@ -1,5 +1,6 @@ package com.ruoyi.abuwx.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.abuwx.domain.WbMaintenanceInformation; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * @author ruoyi * @date 2024-04-09 */ -public interface IWbMaintenanceInformationService +public interface IWbMaintenanceInformationService extends IService { /** * 查询维保记录 @@ -59,4 +60,12 @@ public interface IWbMaintenanceInformationService * @return 结果 */ public int deleteWbMaintenanceInformationById(Long id); + + /** + * 根据项目id查询维保记录列表 + * + * @param projectId 项目id + * @return 维保记录集合 + */ + public List selectWbMaintenanceInformationListByProjectId(Long projectId); } diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/AbucoderWxuserServiceImpl.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/AbucoderWxuserServiceImpl.java index 04b3f47..4cc2990 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/AbucoderWxuserServiceImpl.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/AbucoderWxuserServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.abuwx.service.impl; -import java.util.List; +import com.ruoyi.abuwx.mapper.AbucoderWxuserMapper; +import com.ruoyi.abuwx.service.IAbucoderWxuserService; +import com.ruoyi.common.core.domain.entity.AbucoderWxuser; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.abuwx.mapper.AbucoderWxuserMapper; -import com.ruoyi.abuwx.domain.AbucoderWxuser; -import com.ruoyi.abuwx.service.IAbucoderWxuserService; + +import java.util.List; /** * 微信用户Service业务层处理 diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbMaintenanceInformationServiceImpl.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbMaintenanceInformationServiceImpl.java index fadebf1..a6d8c63 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbMaintenanceInformationServiceImpl.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbMaintenanceInformationServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.abuwx.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.abuwx.domain.WbMaintenanceInformation; import com.ruoyi.abuwx.mapper.WbMaintenanceInformationMapper; import com.ruoyi.abuwx.service.IWbMaintenanceInformationService; @@ -8,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** * 维保记录Service业务层处理 @@ -16,11 +18,15 @@ import java.util.List; * @date 2024-04-09 */ @Service -public class WbMaintenanceInformationServiceImpl implements IWbMaintenanceInformationService +public class WbMaintenanceInformationServiceImpl extends ServiceImpl + implements IWbMaintenanceInformationService { @Autowired private WbMaintenanceInformationMapper wbMaintenanceInformationMapper; + @Autowired + private IWbMaintenanceInformationService iWbMaintenanceInformationService; + /** * 查询维保记录 * @@ -94,4 +100,18 @@ public class WbMaintenanceInformationServiceImpl implements IWbMaintenanceInform { return wbMaintenanceInformationMapper.deleteWbMaintenanceInformationById(id); } + + /** + * 根据项目id查询维保记录列表 + * + * @param projectId 项目id + * @return 结果 + */ + @Override + public List selectWbMaintenanceInformationListByProjectId(Long projectId) { + List list = iWbMaintenanceInformationService.list(); + List collect = list.stream().filter(data -> data.getProjectId() != null + && data.getProjectId().equals(projectId)).collect(Collectors.toList()); + return collect; + } } diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbProjectServiceImpl.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbProjectServiceImpl.java index 753125a..6914d5e 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbProjectServiceImpl.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwx/service/impl/WbProjectServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.abuwx.service.impl; import com.ruoyi.abuwx.domain.WbProject; import com.ruoyi.abuwx.mapper.WbProjectMapper; import com.ruoyi.abuwx.service.IWbProjectService; +import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,6 +54,7 @@ public class WbProjectServiceImpl implements IWbProjectService @Override public int insertWbProject(WbProject wbProject) { + wbProject.setCreateTime(DateUtils.getNowDate()); return wbProjectMapper.insertWbProject(wbProject); } @@ -65,6 +67,7 @@ public class WbProjectServiceImpl implements IWbProjectService @Override public int updateWbProject(WbProject wbProject) { + wbProject.setUpdateTime(DateUtils.getNowDate()); return wbProjectMapper.updateWbProject(wbProject); } diff --git a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwxapi/WxLoginController.java b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwxapi/WxLoginController.java index a725a5d..fb9627b 100644 --- a/ruoyi-abuwx/src/main/java/com/ruoyi/abuwxapi/WxLoginController.java +++ b/ruoyi-abuwx/src/main/java/com/ruoyi/abuwxapi/WxLoginController.java @@ -3,24 +3,42 @@ package com.ruoyi.abuwxapi; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.abuwx.domain.AbucoderWxuser; +import com.ruoyi.abuwx.domain.WbMaintenanceInformation; +import com.ruoyi.abuwx.domain.WbProject; import com.ruoyi.abuwx.service.IAbucoderWxappConfigService; import com.ruoyi.abuwx.service.IAbucoderWxuserService; +import com.ruoyi.abuwx.service.IWbMaintenanceInformationService; +import com.ruoyi.abuwx.service.IWbProjectService; import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.AbucoderWxuser; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.framework.config.ServerConfig; +import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + @RestController @RequestMapping("/wxapi/") -public class WxLoginController { +public class WxLoginController extends BaseController { /** * 测试接口 @@ -28,7 +46,7 @@ public class WxLoginController { */ @GetMapping("test") public AjaxResult test(){ - return AjaxResult.success("小程序api调试成功！~"); + return success("小程序api调试成功！~"); } @Autowired @@ -40,15 +58,29 @@ public class WxLoginController { @Autowired private ServerConfig serverConfig; + @Autowired + private TokenService tokenService; + + @Autowired + private IWbMaintenanceInformationService wbMaintenanceInformationService; + + @Autowired + private ISysUserService iSysUserService; + + @Autowired + private SysUserMapper userMapper; + + @Autowired + private IWbProjectService iWbProjectService; /** * 你自己的微信小程序APPID */ - private final static String AppID = "wxeda4365eac6838c5"; + private final static String AppID = "wxd193ba95e7ce382b"; /** * 你自己的微信APP密钥 */ - private final static String AppSecret = "5005219596b2fa77ad930d06101102b1"; + private final static String AppSecret = "7ba02f4a9abb58dc2862f8a2762e8b85"; /** * 登录时获取的 code（微信官方提供的临时凭证） @@ -73,22 +105,21 @@ public class WxLoginController { JSONObject jsonObject = JSON.parseObject(res); String openid = (String) jsonObject.get("openid"); if (StrUtil.isEmpty(openid)) { - return AjaxResult.error("未获取到openid"); + return error("未获取到openid"); } /**先通过openid来查询是否存在*/ AbucoderWxuser abucoderWxuser = iAbucoderWxuserService.selectAbucoderWxuserOpenID(openid); if (abucoderWxuser == null){ /**如果不存在就插入到我们的数据库里*/ - AbucoderWxuser wxuser = new AbucoderWxuser(); - wxuser.setOpenid(openid); - wxuser.setCreateTime(DateUtils.getNowDate()); - iAbucoderWxuserService.insertAbucoderWxuser(wxuser); + abucoderWxuser = new AbucoderWxuser(); + abucoderWxuser.setOpenid(openid); + abucoderWxuser.setCreateTime(DateUtils.getNowDate()); + iAbucoderWxuserService.insertAbucoderWxuser(abucoderWxuser); /**返回结果集到前段*/ - return AjaxResult.success(wxuser); - }else { - /**返回结果集到前段*/ - return AjaxResult.success(abucoderWxuser); + } + return success(abucoderWxuser).put("token", getToken(abucoderWxuser)); + } @PostMapping("/upload") @@ -103,7 +134,7 @@ public class WxLoginController { // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; - AjaxResult ajax = AjaxResult.success(); + AjaxResult ajax = success(); ajax.put("url", url); ajax.put("fileName", fileName); ajax.put("newFileName", FileUtils.getName(fileName)); @@ -112,7 +143,7 @@ public class WxLoginController { } catch (Exception e) { - return AjaxResult.error(e.getMessage()); + return error(e.getMessage()); } } @@ -136,6 +167,102 @@ public class WxLoginController { abucoderWxuser.setUpdateTime(DateUtils.getNowDate()); iAbucoderWxuserService.updateAbucoderWxuser(abucoderWxuser); //返回前段需要的数据 - return AjaxResult.success(abucoderWxuser); + return success(abucoderWxuser); + } + + private String getToken(AbucoderWxuser wxuser){ + LoginUser loginUser = new LoginUser(); + loginUser.setWxuser(wxuser); + return tokenService.createToken(loginUser); + } + + /** + * + * + * 根据项目id获取维保记录列表 + */ + @RequestMapping("/informationList") + public AjaxResult getInformationList(@RequestParam Long projectId) + { + return success(wbMaintenanceInformationService.selectWbMaintenanceInformationListByProjectId(projectId)); + } + + /** + * 获取维保记录详细信息 + */ + @RequestMapping(value = "/infoId") + public AjaxResult getInformation(@RequestParam Long id) + { + return success(wbMaintenanceInformationService.selectWbMaintenanceInformationById(id)); + } + + /** + * 绑定维保用户 + */ + @PostMapping("/bindWbuser") + public AjaxResult bindWbuser(@RequestBody SysUser sysUser){ + String username = sysUser.getUserName(); + String password = sysUser.getPassword(); + String openid = sysUser.getOpenid(); + //校验传递的用户名、密码、openid都不为空 + if(StringUtils.isEmpty(username) || StringUtils.isEmpty(password) || StringUtils.isEmpty(openid)){ + return error(); + } + //根据传递的用户名获取用户信息 + SysUser user = iSysUserService.selectUserByUserName(username); + if(user == null){ + return error("账号或密码错误！"); + } + if(!StringUtils.isEmpty(user.getOpenid())){ + return error("账号已绑定！"); + } + //校验密码是否正确 + boolean b = SecurityUtils.matchesPassword(user.getPassword(), password); + if (!SecurityUtils.matchesPassword(user.getPassword(), password)) { + user.setOpenid(openid); + userMapper.updateUser(user); + } + return success(user); + } + + /** + * 新增维保记录 + */ + @PostMapping("/addWbMaintenanceInformation") + public AjaxResult addWbMaintenanceInformation(@RequestBody WbMaintenanceInformation wbMaintenanceInformation) + { + return success(wbMaintenanceInformationService.insertWbMaintenanceInformation(wbMaintenanceInformation)); + } + + /** + * 根据openid查询当前微信用户角色 + */ + @RequestMapping("/selectWXuserRole") + public AjaxResult selectWXuserRole(@RequestParam String openid){ + //获取当前用户信息 + SysUser user = iSysUserService.selectUserByopenid(openid); + if(user == null){ + //return success("roleIds",0); + List data = new ArrayList<>(); + data.add(0); + return new AjaxResult(HttpStatus.SUCCESS,"roleIds",data); + } + SysUser newUser = iSysUserService.selectUserById(user.getUserId()); +// List roles = user.getRoles(); +// List collect = roles.stream().map(SysRole::getRoleId).collect(Collectors.toList()); +// return success("roleIds",collect); + //return success("roleIds", newUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + return new AjaxResult(HttpStatus.SUCCESS,"roleIds", newUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + } + + /** + * 小程序分页查询查询项目管理列表 + */ + @GetMapping("/projectList") + public TableDataInfo list(WbProject wbProject) + { + startPage(); + List list = iWbProjectService.selectWbProjectList(wbProject); + return getDataTable(list); } } diff --git a/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbMaintenanceInformationMapper.xml b/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbMaintenanceInformationMapper.xml index 3558193..e04d8db 100644 --- a/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbMaintenanceInformationMapper.xml +++ b/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbMaintenanceInformationMapper.xml @@ -3,11 +3,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + @@ -18,29 +19,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, project_id, project_name, image_url, file_url, create_by, create_time, update_by, update_time, remark from wb_maintenance_information + select id, project_id, project_name, maintenance_type, image_url, file_url, create_by, create_time, update_by, update_time, remark from wb_maintenance_information - + - + insert into wb_maintenance_information project_id, project_name, + maintenance_type, image_url, file_url, create_by, @@ -52,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{projectId}, #{projectName}, + #{maintenanceType}, #{imageUrl}, #{fileUrl}, #{createBy}, @@ -67,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" project_id = #{projectId}, project_name = #{projectName}, + maintenance_type = #{maintenanceType}, image_url = #{imageUrl}, file_url = #{fileUrl}, create_by = #{createBy}, @@ -83,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from wb_maintenance_information where id in + delete from wb_maintenance_information where id in #{id} - \ No newline at end of file + diff --git a/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbProjectMapper.xml b/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbProjectMapper.xml index 781c500..1257d19 100644 --- a/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbProjectMapper.xml +++ b/ruoyi-abuwx/src/main/resources/mapper/abuwx/WbProjectMapper.xml @@ -9,10 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select id, project_name, project_overview, file_url from wb_project + select id, project_name, project_overview, file_url, create_by, create_time, update_by, update_time, remark from wb_project + + insert into sys_user( user_id,