Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-admin

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java

@@ -0,0 +1,32 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.model.domain.AppletAmountLog;
+import com.ruoyi.model.domain.AppletConfig;
+import com.ruoyi.model.service.IAppletAmountLogService;
+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;
+
+import java.util.List;
+
+@Api(description = "小程序-金额相关接口")
+@RestController
+@RequestMapping("/applet/amount")
+public class ApiAppletAmountController {
+    //金额流水信息
+    @Autowired
+    private IAppletAmountLogService appletAmountLogService;
+
+    @ApiOperation("小程序-金额流水信息列表数据查询")
+    @PostMapping("/amountLogList")
+    public AjaxResult amountLogList(@RequestBody AppletAmountLog appletAmountLog){
+        List<AppletAmountLog> amountLogList = appletAmountLogService.selectAppletAmountLogList(appletAmountLog);
+        return AjaxResult.success("金额流水信息列表数据",amountLogList);
+    }
+
+}

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletConfigController.java

@@ -0,0 +1,56 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.model.domain.AppletConfig;
+import com.ruoyi.model.domain.AppletQuestion;
+import com.ruoyi.model.domain.AppletService;
+import com.ruoyi.model.domain.AppletTrain;
+import com.ruoyi.model.service.*;
+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;
+
+import java.util.List;
+
+@Api(description = "小程序-配置信息")
+@RestController
+@RequestMapping("/applet/config")
+public class ApiAppletConfigController {
+    //配置信息
+    @Autowired
+    private IAppletConfigService appletConfigService;
+
+    //平台&服务介绍
+    @Autowired
+    private IAppletServiceService appletServiceService;
+
+    //服务培训
+    @Autowired
+    private IAppletTrainService appletTrainService;
+
+    @ApiOperation("小程序-配置信息列表数据查询")
+    @PostMapping("/configList")
+    public AjaxResult configList(@RequestBody AppletConfig appletConfig){
+        List<AppletConfig> configList = appletConfigService.selectAppletConfigList(appletConfig);
+        return AjaxResult.success("配置信息列表数据",configList);
+    }
+
+    @ApiOperation("小程序-平台&服务介绍列表数据查询")
+    @PostMapping("/serviceList")
+    public AjaxResult serviceList(@RequestBody AppletService appletService){
+        List<AppletService> serviceList = appletServiceService.selectAppletServiceList(appletService);
+        return AjaxResult.success("台&服务介绍列表数据",serviceList);
+    }
+
+    @ApiOperation("小程序-服务培训列表数据查询")
+    @PostMapping("/trainList")
+    public AjaxResult trainList(@RequestBody AppletTrain appletTrain){
+        List<AppletTrain> trainList = appletTrainService.selectAppletTrainList(appletTrain);
+        return AjaxResult.success("服务培训列表数据",trainList);
+    }
+
+}

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java

@@ -0,0 +1,138 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.model.domain.*;
+import com.ruoyi.model.service.*;
+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;
+
+import java.util.List;
+
+@Api(description = "伴宠师-伴宠师考核")
+@RestController
+@RequestMapping("/applet/examination")
+public class ApiAppletExaminationController {
+
+    //题目信息
+    @Autowired
+    private IAppletQuestionService appletQuestionService;
+
+    //题目答案信息
+    @Autowired
+    private IAppletAnswerService appletAnswerService;
+
+    //宠物类型
+    @Autowired
+    private IAppletPetTypeService appletPetTypeService;
+
+    //专业执照
+    @Autowired
+    private IAppletLicenseService appletLicenseService;
+
+    //用户基本考核答案
+    @Autowired
+    private IAppletAnswerBaseService appletAnswerBaseService;
+
+    //用户培训考核答案
+    @Autowired
+    private IAppletAnswerTrainService appletAnswerTrainService;
+
+    @ApiOperation("伴宠师工作台-题目列表数据查询")
+    @PostMapping("/questionList")
+    public AjaxResult questionList(@RequestBody AppletQuestion question){
+        List<AppletQuestion> questionList = appletQuestionService.selectAppletQuestionList(question);
+        return AjaxResult.success("题目列表数据",questionList);
+    }
+
+    @ApiOperation("伴宠师工作台-根据题目id查询题目答案")
+    @PostMapping("/insertUser")
+    public AjaxResult answerListByQuestionId(long questionId){
+        AppletAnswer appletAnswer = new AppletAnswer();
+        appletAnswer.setQuestionId(questionId);
+        List<AppletAnswer> answerList = appletAnswerService.selectAppletAnswerList(appletAnswer);
+        return AjaxResult.success("答案列表数据",answerList);
+    }
+
+    @ApiOperation("伴宠师工作台-查询宠物类型列表")
+    @PostMapping("/petTypeList")
+    public AjaxResult petTypeList(@RequestBody AppletPetType appletPetType){
+        List<AppletPetType> petTypeList = appletPetTypeService.selectAppletPetTypeList(appletPetType);
+        return AjaxResult.success("宠物类型列表数据",petTypeList);
+    }
+
+    @ApiOperation("伴宠师工作台-查询专业执照列表")
+    @PostMapping("/licenseList")
+    public AjaxResult licenseList(@RequestBody AppletLicense appletLicense){
+        List<AppletLicense> licenseList = appletLicenseService.selectAppletLicenseList(appletLicense);
+        return AjaxResult.success("专业执照列表数据",licenseList);
+    }
+
+//    @ApiOperation("伴宠师工作台-查询用户基本考核答案列表")
+//    @PostMapping("/answerBaseList")
+//    public AjaxResult answerBaseList(@RequestBody AppletAnswerBase answerBase){
+//        List<AppletAnswerBase> answerBaseList = appletAnswerBaseService.selectAppletAnswerBaseList(answerBase);
+//        return AjaxResult.success("用户基本考核答案列表数据",answerBaseList);
+//    }
+
+    @ApiOperation("伴宠师工作台-根据题目id查询基本考核答案")
+    @PostMapping("/answeBaseByQuestionId")
+    public AjaxResult answeBaseByQuestionId(Long questionId, Long userId){
+        AppletAnswerBase answerBase = new AppletAnswerBase();
+        answerBase.setQuestionId(questionId);
+        answerBase.setUserId(userId);
+        List<AppletAnswerBase> answerBaseList = appletAnswerBaseService.selectAppletAnswerBaseList(answerBase);
+
+        for (AppletAnswerBase appletAnswerBase : answerBaseList) {
+            AppletAnswer answer = appletAnswerService.selectAppletAnswerById(appletAnswerBase.getAnswerId());
+            appletAnswerBase.setAnswer(answer);
+        }
+
+        return AjaxResult.success("用户基本考核答案列表数据",answerBaseList);
+    }
+
+    @ApiOperation("伴宠师工作台-添加用户基本考核答案")
+    @PostMapping("/addBaseAnswer")
+    public AjaxResult addBaseAnswer(@RequestBody AppletAnswerBase answerBase){
+        return toAjax(appletAnswerBaseService.insertAppletAnswerBase(answerBase));
+    }
+
+//    @ApiOperation("伴宠师工作台-查询用户培训考核答案列表")
+//    @PostMapping("/answeTrainList")
+//    public AjaxResult answeTrainList(@RequestBody AppletAnswerTrain answerTrain){
+//        List<AppletAnswerTrain> answerTrainList = appletAnswerTrainService.selectAppletAnswerTrainList(answerTrain);
+//
+//        for (AppletAnswerTrain appletAnswerTrain : answerTrainList) {
+//            AppletQuestion question = appletQuestionService.selectAppletQuestionById(appletAnswerTrain.getQuestionId());
+//            appletAnswerTrain.setQuestion(question);
+//        }
+//
+//        return AjaxResult.success("用户培训考核答案列表数据",answerTrainList);
+//    }
+
+    @ApiOperation("伴宠师工作台-根据题目id查询培训考核答案")
+    @PostMapping("/answeTrainByQuestionId")
+    public AjaxResult answeTrainByQuestionId(Long questionId, Long userId){
+        AppletAnswerTrain answerTrain = new AppletAnswerTrain();
+        answerTrain.setQuestionId(questionId);
+        answerTrain.setUserId(userId);
+        List<AppletAnswerTrain> answerTrainList = appletAnswerTrainService.selectAppletAnswerTrainList(answerTrain);
+
+        return AjaxResult.success("用户培训考核答案列表数据",answerTrainList);
+    }
+
+    @ApiOperation("伴宠师工作台-添加用户培训考核答案")
+    @PostMapping("/addTrainAnswer")
+    public AjaxResult addTrainAnswer(@RequestBody AppletAnswerTrain answerTrain){
+        return toAjax(appletAnswerTrainService.insertAppletAnswerTrain(answerTrain));
+    }
+
+    protected AjaxResult toAjax(int rows) {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+}

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java

@@ -0,0 +1,53 @@
+package com.ruoyi.applet.contoller;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.domain.AppletUser1;
+import com.ruoyi.model.service.IAppUsersService;
+import com.ruoyi.model.service.IAppletUser1Service;
+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;
+
+import java.util.List;
+
+@Api(description = "伴宠师-伴宠师认证")
+@RestController
+@RequestMapping("/applet/UserTeacher")
+public class ApiAppletUserTeacherController {
+    @Autowired
+    private IAppUsersService appUsersService;
+
+    @ApiOperation("伴宠师工作台-伴宠师列表数据查询")
+    @PostMapping("/userList")
+    public AjaxResult userList(@RequestBody AppUsers user){
+        List<AppUsers> userList = appUsersService.selectAppUsersList(user);
+        return AjaxResult.success("宠师列表数据",userList);
+    }
+
+    @ApiOperation("伴宠师工作台-伴宠师基本信息添加")
+    @PostMapping("/insertUser")
+    public AjaxResult insertUser(@RequestBody AppUsers user){
+        return toAjax(appUsersService.insertAppUsers(user));
+    }
+
+    @ApiOperation("伴宠师工作台-伴宠师基本信息修改")
+    @PostMapping("/udpateUser")
+    public AjaxResult udpateUser(@RequestBody AppUsers user){
+        return toAjax(appUsersService.updateAppUsers(user));
+    }
+
+    @ApiOperation("伴宠师工作台-伴宠师基本信息删除")
+    @PostMapping("/deleteUser")
+    public AjaxResult deleteUser(long id){
+        return toAjax(appUsersService.deleteAppUsersByUserId(id));
+    }
+
+    protected AjaxResult toAjax(int rows) {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAnswerBase.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -33,6 +34,10 @@ public class AppletAnswerBase extends BaseEntity
     /** 删除标识 */
     private Integer delFlag;
 
+    //答案信息
+    @TableField(exist = false)
+    private AppletAnswer answer;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -79,6 +84,15 @@ public class AppletAnswerBase extends BaseEntity
         return delFlag;
     }
 
+    public AppletAnswer getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(AppletAnswer answer) {
+        this.answer = answer;
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAnswerTrain.java

@@ -1,5 +1,6 @@
 package com.ruoyi.model.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -33,6 +34,10 @@ public class AppletAnswerTrain extends BaseEntity
     /** 删除标识 */
     private Integer delFlag;
 
+    //题目信息
+    @TableField(exist = false)
+    private AppletQuestion question;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -79,6 +84,14 @@ public class AppletAnswerTrain extends BaseEntity
         return delFlag;
     }
 
+    public AppletQuestion getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(AppletQuestion question) {
+        this.question = question;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)