个人信息编辑

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 public interface ProfessionMapper extends BaseMapper<Profession> {
     Profession add(Profession profession);
 
-    List<Profession> getList();
+    List<Profession> getList(@Param("type") Integer type);
 
     Profession getById(@Param("id") Integer id);
 

wisenergy-mapper/src/main/resources/mapper/ProfessionMapper.xml

@@ -61,6 +61,9 @@
         <include refid="cols_all"/>
         from
         <include refid="table"/>
+        <where>
+            type=#{type}
+        </where>
     </select>
 
     <select id="getById" resultType="cn.wisenergy.model.app.Profession">

wisenergy-model/src/main/java/cn/wisenergy/model/app/Profession.java

 package cn.wisenergy.model.app;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -66,4 +68,11 @@ public class Profession implements Serializable {
      */
     @ApiModelProperty(value = "子专业", name = "updateTime")
     private List<Profession> children;
+
+    /**
+     * 是否选中  false : 未选中 true : 选中
+     */
+    @ApiModelProperty(value = "是否选中  false : 未选中 true : 选中", name = "checked")
+    @TableField(exist = false)
+    private Boolean checked =false;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java

@@ -11,7 +11,8 @@ import java.io.Serializable;
 *@ Description: 用户提交Dto
 *@ Author     : 86187
 *@ Date       : 2021/1/12 15:39
-*/
+ * @author 86187
+ */
 @Data
 @ApiModel(value = "UserCommitDto")
 public class UserCommitDto implements Serializable {

wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java

@@ -10,6 +10,7 @@ import java.io.Serializable;
  * @ Description: 用户信息Vo
  * @ Author     : 86187
  * @ Date       : 2021/1/7 11:14
+ * @author 86187
  */
 @Data
 @ApiModel(value = "UserInfoVo")

wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java

@@ -16,5 +16,5 @@ public interface ProfessionService {
      * 获取专业树结构
      * @return 树列表
      */
-    R<List<Profession>> getTree();
+    R<List<Profession>> getTree(Integer type);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java

@@ -40,7 +40,7 @@ public interface UserService {
      * @param user 用户信息
      * @return true 成功 false 失败
      */
-    R<Boolean> edit(User user);
+    R<Boolean> edit(UserCommitDto user);
 
     /**
      * 删除用户

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java

@@ -25,11 +25,12 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
     private ProfessionMapper professionMapper;
 
     @Override
-    public R<List<Profession>> getTree() {
+    public R<List<Profession>> getTree(Integer type) {
         log.info("volunteer-service[]ProfessionServiceImpl[]getTree[]input.method");
 
         //获取所有专业
-        List<Profession> rootList = professionMapper.getList();
+
+        List<Profession> rootList = professionMapper.getList(type);
 
         //构造树形接口：递归
         List<Profession> streetList = getStreetList(rootList);

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -55,10 +55,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         HashMap<String, Object> map = new HashMap<>(4);
 
         //将参数放入容器中
-        map.put("pageNo",queryVo.getPageNo()-1);
-        map.put("pageSize",queryVo.getPageSize());
-        map.put("startTime",queryVo.getStartTime());
-        map.put("endTime",queryVo.getEndTime());
+        map.put("pageNo", queryVo.getPageNo() - 1);
+        map.put("pageSize", queryVo.getPageSize());
+        map.put("startTime", queryVo.getStartTime());
+        map.put("endTime", queryVo.getEndTime());
 
         //查询用户数据
         List<User> list1 = usersMapper.getList(map);
@@ -75,7 +75,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             PayRecord byId = payRecordMapper.getById(user.getId());
 
             //将消息进行同步
-            BeanUtils.copyProperties(user,userInfoDto);
+            BeanUtils.copyProperties(user, userInfoDto);
             userInfoDto.setUserId(user.getId());
             userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
             userInfoDto.setMajorGrade(scoreInfo.getMajorGrade().toString());
@@ -92,7 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         info.setPageNum(queryVo.getPageNo());
         info.setTotal(usersMapper.getUserNumbers());
         info.setList(list);
-        if (info.getList().size()==0) {
+        if (info.getList().size() == 0) {
             return R.error("占时还没有用户");
         }
         return R.ok(info);
@@ -140,8 +140,43 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     }
 
     @Override
-    public R<Boolean> edit(User user) {
-        return null;
+    public R<Boolean> edit(UserCommitDto userDto) {
+        if (null == userDto) {
+            return R.error("入参为空!");
+        }
+
+        //1、根据用户id,获取用户信息
+        User user = usersMapper.selectById(userDto.getUserId());
+        if (null == user) {
+            return R.error("用户信息不存在!");
+        }
+
+        //2、要提交的用户信息
+        user.setSchool(userDto.getSchool());
+        user.setSex(userDto.getSex());
+        user.setExamType(userDto.getStudentType());
+        user.setUserName(userDto.getUserName());
+
+
+        //3、要提交的用户的成绩信息
+        ScoreInfo scoreInfo = scoreInfoMapper.getById(userDto.getUserId());
+        scoreInfo.setUserId(userDto.getUserId());
+        scoreInfo.setBiologyGrade(userDto.getScoreInfo().getBiologyGrade());
+        scoreInfo.setChemistryGrade(userDto.getScoreInfo().getChemistryGrade());
+        scoreInfo.setCultureGrade(userDto.getScoreInfo().getCultureGrade());
+        scoreInfo.setEnglishGrade(userDto.getScoreInfo().getEnglishGrade());
+        scoreInfo.setGeographyGrade(userDto.getScoreInfo().getGeographyGrade());
+        scoreInfo.setHistoryGrade(userDto.getScoreInfo().getHistoryGrade());
+        scoreInfo.setLanguageGrade(userDto.getScoreInfo().getLanguageGrade());
+        scoreInfo.setMajorGrade(userDto.getScoreInfo().getMajorGrade());
+        scoreInfo.setMathGrade(userDto.getScoreInfo().getMathGrade());
+        scoreInfo.setPhysicsGrade(userDto.getScoreInfo().getPhysicsGrade());
+        scoreInfo.setPoliticsGrade(userDto.getScoreInfo().getPoliticsGrade());
+
+        //4、更新用户信息和保存用户成绩
+        boolean bool = updateAndUserInfo(user, scoreInfo);
+
+        return R.ok(bool);
     }
 
     @Override
@@ -201,8 +236,14 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         orderQueryVo.setPageSize(pageSize);
     }
 
+    /**
+     * 保存个人信息
+     * @param user 用户信息
+     * @param scoreInfo 成绩信息
+     * @return true or false
+     */
     @Transactional
-    public boolean updateAndSaveUserInfo(User user, ScoreInfo scoreInfo) {
+    public Boolean updateAndSaveUserInfo(User user, ScoreInfo scoreInfo) {
         //1、更新用户信息
         int count = usersMapper.edit(user);
         if (count == 0) {
@@ -217,4 +258,27 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
         return true;
     }
+
+    /**
+     * 编辑个人信息
+     * @param user 用户信息
+     * @param scoreInfo 成绩信息
+     * @return true or false
+     */
+    @Transactional()
+    public Boolean updateAndUserInfo(User user, ScoreInfo scoreInfo) {
+        //1、更新用户信息
+        int count = usersMapper.edit(user);
+        if (count == 0) {
+            return false;
+        }
+
+        //2、保存用户成绩信息
+        int save = scoreInfoMapper.edit(scoreInfo);
+        if (save == 0) {
+            return false;
+        }
+
+        return true;
+    }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java

@@ -29,8 +29,12 @@ public class ProfessionController {
     private ProfessionService professionService;
 
     @ApiOperation(value = "获取专业树结构", notes = "获取专业树结构", httpMethod = "GET")
+    @ApiImplicitParam(name = "type", value = "考生类型 1：文化考生 2：美术考生 3：体育生 4：文学编导", dataType = "int")
     @GetMapping("/getTree")
-    public R<List<Profession>> getTree(){
-        return professionService.getTree();
+    public R<List<Profession>> getTree(Integer type) {
+        if (null == type) {
+            return R.error("入参为空!");
+        }
+        return professionService.getTree(type);
     }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java

@@ -54,6 +54,18 @@ public class UserController {
         return userService.commitUserInfo(userInfo);
     }
 
+    @ApiOperation(value = "编辑个人信息", notes = "编辑个人信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "userInfo", value = "个人信息", dataType = "UserCommitDto")
+    @PostMapping("/edit")
+    public R<Boolean> edit(@RequestBody UserCommitDto userInfo) {
+        log.info("UserController[]edit[]input.param:queryV0:" + userInfo);
+        if (null == userInfo) {
+            return R.error("入参为空!");
+        }
+        //返回数据
+        return userService.edit(userInfo);
+    }
+
     @ApiOperation(value = "获取个人信息", notes = "获取个人信息", httpMethod = "GET")
     @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int")
     @GetMapping("/getById")

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://172.18.1.55:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+      url: jdbc:mysql://192.168.110.165:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
       password: adm4HYservice$
       initial-size: 10