Merge branch 'dev' of http://gitlab.polyhome.net/polysoft-nafmii/polysoft-parent into dev

nafmii-admin/src/main/java/org/nafmii/admin/NafmiiAdminApplication.java

@@ -6,10 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages={"org.nafmii"})
 @EnableEurekaClient
 @EnableEurekaClient
 @EnableFeignClients
 @EnableFeignClients
-@MapperScan("org.nafmii.admin/**/dao")
+@MapperScan(basePackages ={"org.nafmii.admin.user.dao"})
 public class NafmiiAdminApplication {
 public class NafmiiAdminApplication {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {

nafmii-admin/src/main/java/org/nafmii/admin/swagger/SwaggerConfig.java

@@ -25,7 +25,7 @@ public class SwaggerConfig {
       //  String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名
       //  String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名
         return new Docket (DocumentationType.SWAGGER_2)
         return new Docket (DocumentationType.SWAGGER_2)
                 .select ()
                 .select ()
-                .apis (RequestHandlerSelectors.basePackage ("org.nafmii.admin"))
+                .apis (RequestHandlerSelectors.basePackage ("org.nafmii.admin.user"))
                 .paths (PathSelectors.any ())
                 .paths (PathSelectors.any ())
                 .build ()
                 .build ()
                 .apiInfo (apiInfo ())
                 .apiInfo (apiInfo ())

nafmii-admin/src/main/java/org/nafmii/admin/user/controller/CenterRoleController.java

+package org.nafmii.admin.user.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nafmii.admin.user.dto.CenterRoleDto;
+import org.nafmii.admin.user.service.ICenterRoleService;
+import org.nafmii.admin.user.vo.CenterUserVO;
+import org.nafmii.common.response.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 中心端角色表 前端控制器
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@RestController
+@RequestMapping("/nafmii/admin/role")
+@Api(tags = "3.0.0", description = "中心端角色接口")
+public class CenterRoleController {
+    @Autowired
+    private ICenterRoleService centerRoleService;
+
+    @ApiOperation( value = "中心端角色新增修改",notes = "中心端角色新增修改")
+    @PostMapping("/edit")
+    @ResponseBody
+    public ApiResponse editRoles (@RequestBody CenterRoleDto centerRoleDto){
+        ApiResponse<CenterUserVO> login = centerRoleService.editRoles(centerRoleDto);
+        return login;
+    }
+
+    @ApiOperation( value = "中心端角色查询",notes = "中心端角色查询")
+    @PostMapping("/query")
+    @ResponseBody
+    public ApiResponse queryRoles (){
+        ApiResponse<CenterUserVO> login = centerRoleService.queryRoles();
+        return login;
+    }
+
+    @ApiOperation( value = "中心端角色删除",notes = "中心端角色删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ApiResponse deleteRoles(@RequestParam Long[] ids){
+        ApiResponse<CenterUserVO> login = centerRoleService.deleteRoles(ids);
+        return login;
+    }
+
+    @ApiOperation( value = "中心端用户对应角色查询",notes = "中心端用户对应角色查询")
+    @PostMapping("/queryUserRole")
+    @ResponseBody
+    public ApiResponse queryRolesByUser (@RequestParam Long userid){
+        ApiResponse<CenterUserVO> login = centerRoleService.queryRolesByUser(userid);
+        return login;
+    }
+}
+

nafmii-admin/src/main/java/org/nafmii/admin/user/controller/CenterUserController.java

+package org.nafmii.admin.user.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nafmii.admin.user.dto.LoginDto;
+import org.nafmii.admin.user.service.ICenterUserService;
+import org.nafmii.admin.user.vo.CenterUserVO;
+import org.nafmii.common.response.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 中心端-用户表 前端控制器
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@RestController
+@RequestMapping("/nafmii/admin/user")
+@Api(tags = "3.0.0", description = "中心端用户接口")
+public class CenterUserController {
+    @Autowired
+    private ICenterUserService centerUserService;
+
+    @ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆")
+    @PostMapping("/login")
+    @ResponseBody
+    public ApiResponse<CenterUserVO> login (@RequestBody LoginDto loginDto){
+        ApiResponse<CenterUserVO> login = centerUserService.userLogin(loginDto);
+        return login;
+    }
+}
+

nafmii-admin/src/main/java/org/nafmii/admin/user/controller/TestController.java

-package org.nafmii.admin.user.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.nafmii.admin.user.service.TestService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author:zhoujh
- * @Function:TODO
- * @date 2021/4/20 15:46
- * @ClassName:
- * @version:
- * @remark:
- */
-@RestController
-@RequestMapping("web/nafmii/test/")
-@Api(tags = "1.0.0", description = "测试")
-public class TestController {
-    @Autowired
-    private TestService service;
-
-    @ApiOperation( value = "测试",notes = "测试")
-    @GetMapping("search")
-    public String search(){
-
-        return "test";
-    }
-}

nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterRoleMapper.java

+package org.nafmii.admin.user.dao;
+
+import org.nafmii.admin.user.entity.CenterRolePO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nafmii.admin.user.vo.CenterUserVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 中心端角色表 Mapper 接口
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+public interface CenterRoleMapper extends BaseMapper<CenterRolePO> {
+    /**
+     * @author:suncq
+     * @Function:中心端角色新增修改
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    int updateRoleById(CenterRolePO crp);
+
+    /**
+     * @author:suncq
+     * @Function:中心端角色查询
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    List<CenterUserVO> queryRoles();
+
+    /**
+     * @author:suncq
+     * @Function:中心端角色删除
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    int deleteRoles(Long[] ids);
+
+    /**
+     * @author:suncq
+     * @Function:中心端用户对应角色查询
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    List queryRolesByUser(Long userid);
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/dao/CenterUserMapper.java

+package org.nafmii.admin.user.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.nafmii.admin.user.entity.CenterUserPO;
+import org.nafmii.admin.user.vo.CenterUserVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 中心端-用户表 Mapper 接口
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Mapper
+public interface CenterUserMapper extends BaseMapper<CenterUserPO> {
+    /**
+     * @author:suncq
+     * @Function:中心端用户登陆
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    List<CenterUserVO> selectUserByPhone(@Param("phone") String phone);
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/dto/CenterRoleDto.java

+package org.nafmii.admin.user.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 中心端角色表
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("中心端新增修改角色参数对象")
+public class CenterRoleDto extends Model {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty(value = "角色名称")
+    @NotNull(message = "角色名称不能为空")
+    private String rName;
+
+    @ApiModelProperty(value = "启用禁用  0 启用 1禁用")
+    private String isEnable;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createUserId;
+
+    @ApiModelProperty(value = "修改人")
+    private Long updateUserId;
+
+
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/dto/LoginDto.java

+package org.nafmii.admin.user.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author:suncq
+ * @Function:TODO
+ * @date 2021/4/27
+ * @ClassName:
+ * @version:
+ * @remark:
+ */
+@Data
+@ApiModel("app用户登陆参数对象")
+public class LoginDto {
+
+    @NotNull(message = "手机号或登录账号不能为空")
+    @ApiModelProperty("手机号/登录账号")
+    private String phone;
+
+    @NotNull(message = "登陆密码不能为空")
+    @ApiModelProperty("登陆密码")
+    private String loginPwd;
+
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/entity/CenterRolePO.java

+package org.nafmii.admin.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 中心端角色表
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("CENTER_ROLE")
+@ApiModel(value="CenterRolePO对象", description="中心端角色表")
+public class CenterRolePO extends Model {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty(value = "角色名称")
+    @TableField("R_NAME")
+    private String rName;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREAT_TIME")
+    private LocalDateTime creatTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATE_TIME")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "启用禁用  0 启用 1禁用")
+    @TableField("IS_ENABLE")
+    private String isEnable;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATE_USER_ID")
+    private Long createUserId;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("UPDATE_USER_ID")
+    private Long updateUserId;
+
+
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/entity/CenterUserPO.java

+package org.nafmii.admin.user.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 中心端-用户表
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("CENTER_USER")
+@ApiModel(value="CenterUserPO对象", description="中心端-用户表")
+public class CenterUserPO extends Model {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty(value = "登录用户名")
+    @TableField("LOGIN_NAME")
+    private String loginName;
+
+    @ApiModelProperty(value = "登录密码")
+    @TableField("LOGIN_PWD")
+    private String loginPwd;
+
+    @ApiModelProperty(value = "中文姓名")
+    @TableField("CN_NAME")
+    private String cnName;
+
+    @ApiModelProperty(value = "英文姓名")
+    @TableField("EN_NAME")
+    private String enName;
+
+    @ApiModelProperty(value = "移动电话")
+    @TableField("PHONE")
+    private String phone;
+
+    @ApiModelProperty(value = "固定电话")
+    @TableField("TELPHONE")
+    private String telphone;
+
+    @ApiModelProperty(value = "0 男 1 女")
+    @TableField("SEX")
+    private String sex;
+
+    @ApiModelProperty(value = "邮箱地址")
+    @TableField("EMAIL")
+    private String email;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATE_USER_ID")
+    private Long createUserId;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("UPDATE_USER_ID")
+    private Long updateUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATE_TIME")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATE_TIME")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "0 有效 1 无效")
+    @TableField("IS_ENABLE")
+    private String isEnable;
+
+
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterRoleService.java

+package org.nafmii.admin.user.service;
+
+import org.nafmii.admin.user.dto.CenterRoleDto;
+import org.nafmii.admin.user.dto.LoginDto;
+import org.nafmii.admin.user.entity.CenterRolePO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nafmii.admin.user.vo.CenterUserVO;
+import org.nafmii.common.response.ApiResponse;
+
+/**
+ * <p>
+ * 中心端角色表 服务类
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+public interface ICenterRoleService{
+    /**
+     * @author:suncq
+     * @Function:中心端角色新增修改
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    ApiResponse editRoles(CenterRoleDto centerRoleDto);
+
+    /**
+     * @author:suncq
+     * @Function:中心端角色查询
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    ApiResponse queryRoles();
+
+    /**
+     * @author:suncq
+     * @Function:中心端角色删除
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    ApiResponse deleteRoles(Long[] ids);
+
+    /**
+     * @author:suncq
+     * @Function:中心端用户对应角色查询
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    ApiResponse queryRolesByUser(Long userid);
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/service/ICenterUserService.java

+package org.nafmii.admin.user.service;
+
+import org.nafmii.admin.user.dto.LoginDto;
+import org.nafmii.admin.user.vo.CenterUserVO;
+import org.nafmii.common.response.ApiResponse;
+
+/**
+ * <p>
+ * 中心端-用户表 服务类
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+public interface ICenterUserService {
+    /**
+     * @author:suncq
+     * @Function:中心端用户登陆
+     * @date 2021/4/27
+     * @ClassName:
+     * @version:
+     * @remark:
+     */
+    ApiResponse<CenterUserVO> userLogin(LoginDto loginDto);
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/service/TestService.java

-package org.nafmii.admin.user.service;
-
-
-
-/**
- * @author:zhoujh
- * @Function:TODO
- * @date 2021/4/22 8:57
- * @ClassName:
- * @version:
- * @remark:
- */
-public interface TestService {
-
-}

nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterRoleServiceImpl.java

+package org.nafmii.admin.user.service.impl;
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.StrUtil;
+import org.nafmii.admin.user.dao.CenterRoleMapper;
+import org.nafmii.admin.user.dao.CenterUserMapper;
+import org.nafmii.admin.user.dto.CenterRoleDto;
+import org.nafmii.admin.user.entity.CenterRolePO;
+import org.nafmii.admin.user.service.ICenterRoleService;
+import org.nafmii.admin.user.vo.CenterUserVO;
+import org.nafmii.common.exception.BusinessException;
+import org.nafmii.common.response.ApiResponse;
+import org.nafmii.common.utils.SnowFlakeUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 中心端角色表 服务实现类
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Service
+public class CenterRoleServiceImpl implements ICenterRoleService {
+    @Resource
+    private CenterRoleMapper centerRoleMapper;
+
+    /**
+     * 中心端角色新增修改
+     * @param centerRoleDto
+     * @return
+     */
+    @Override
+    public ApiResponse editRoles(CenterRoleDto centerRoleDto) {
+        ApiResponse apiResponse =new ApiResponse();
+        Long roleId = centerRoleDto.getId();
+        if(null == roleId){//新增
+            CenterRolePO crp = new CenterRolePO();
+            crp.setId(SnowFlakeUtil.nextId());
+            crp.setRName(centerRoleDto.getRName());
+            crp.setCreateUserId(123l);
+            crp.setCreatTime(LocalDateTime.now());
+            crp.setUpdateUserId(123l);
+            crp.setUpdateTime(LocalDateTime.now());
+            int i = centerRoleMapper.insert(crp);
+            if (i<0){
+                throw new BusinessException("新增失败，请稍后重试");
+            }else{
+                apiResponse.setStatus(200);
+                apiResponse.setStatusText("新增成功");
+            }
+        }else{//修改
+            CenterRolePO crp = new CenterRolePO();
+            crp.setId(centerRoleDto.getId());
+            crp.setRName(centerRoleDto.getRName());
+            crp.setCreateUserId(123l);
+            crp.setCreatTime(LocalDateTime.now());
+            crp.setUpdateUserId(123l);
+            crp.setUpdateTime(LocalDateTime.now());
+            int i = centerRoleMapper.updateRoleById(crp);
+            if (i<0){
+                throw new BusinessException("修改失败，请稍后重试");
+            }else{
+                apiResponse.setStatus(200);
+                apiResponse.setStatusText("修改成功");
+            }
+        }
+        return apiResponse;
+    }
+
+    /**
+     * 中心端角色查询
+     * @param
+     * @return
+     */
+    @Override
+    public ApiResponse queryRoles() {
+        ApiResponse apiResponse =new ApiResponse();
+        List<CenterUserVO> result = centerRoleMapper.queryRoles();
+        apiResponse.setData(result);
+        apiResponse.setStatus(200);
+        apiResponse.setStatusText("查询成功");
+        return apiResponse;
+    }
+
+    /**
+     * 中心端角色查询
+     * @param
+     * @return
+     */
+    @Override
+    public ApiResponse deleteRoles(Long[] ids) {
+        ApiResponse apiResponse =new ApiResponse();
+        int result = centerRoleMapper.deleteRoles(ids);
+        apiResponse.setData(result);
+        apiResponse.setStatus(200);
+        apiResponse.setStatusText("删除成功");
+        return apiResponse;
+    }
+
+    /**
+     * 中心端用户对应角色查询
+     * @param
+     * @return
+     */
+    @Override
+    public ApiResponse queryRolesByUser(Long userid) {
+        ApiResponse apiResponse =new ApiResponse();
+        List result = centerRoleMapper.queryRolesByUser(userid);
+        apiResponse.setData(result);
+        apiResponse.setStatus(200);
+        apiResponse.setStatusText("查询成功");
+        return apiResponse;
+    }
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/CenterUserServiceImpl.java

+package org.nafmii.admin.user.service.impl;
+
+import org.nafmii.admin.user.dao.CenterUserMapper;
+import org.nafmii.admin.user.dto.LoginDto;
+import org.nafmii.admin.user.service.ICenterUserService;
+import org.nafmii.admin.user.vo.CenterUserVO;
+import org.nafmii.common.exception.BusinessException;
+import org.nafmii.common.response.ApiResponse;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 中心端-用户表 服务实现类
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Service
+public class CenterUserServiceImpl implements ICenterUserService {
+    @Resource
+    private CenterUserMapper centerUserMapper;
+
+    /**
+     * 中心端用户登陆
+     * @param loginDto
+     * @return
+     */
+    @Override
+    public ApiResponse<CenterUserVO> userLogin(LoginDto loginDto) {
+        ApiResponse apiResponse =new ApiResponse();
+        List<CenterUserVO> userVo = new ArrayList<>();
+        //账号密码登陆
+        String phone = loginDto.getPhone();
+        userVo = centerUserMapper.selectUserByPhone(phone);
+        if (userVo.isEmpty()){
+            throw new BusinessException("该用户未注册，请先注册！");
+        }else{
+            if(!loginDto.getLoginPwd().equals(userVo.get(0).getLoginPwd())){
+                throw new BusinessException("用户名或密码错误，请重新输入！");
+            }else{
+                apiResponse.setData(userVo);
+                apiResponse.setStatus(200);
+                apiResponse.setStatusText("登录成功！");
+            }
+        }
+        return apiResponse;
+    }
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/TestServiceImpl.java

-package org.nafmii.admin.user.service.impl;
-
-
-import org.nafmii.admin.user.service.TestService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author:zhoujh
- * @Function:TODO
- * @date 2021/4/22 8:58
- * @ClassName:
- * @version:
- * @remark:
- */
-@Service
-public class TestServiceImpl implements TestService {
-
-
-}

nafmii-admin/src/main/java/org/nafmii/admin/user/vo/CenterRoleVO.java

+package org.nafmii.admin.user.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 中心端角色表
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("角色返回报文")
+public class CenterRoleVO extends Model {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "角色名称")
+    private String rName;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime creatTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "启用禁用  0 启用 1禁用")
+    private String isEnable;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createUserId;
+
+    @ApiModelProperty(value = "修改人")
+    private Long updateUserId;
+
+
+}

nafmii-admin/src/main/java/org/nafmii/admin/user/vo/CenterUserVO.java

+package org.nafmii.admin.user.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 中心端-用户表
+ * </p>
+ *
+ * @author suncq
+ * @since 2021-04-27
+ */
+@Data
+@ApiModel("用户返回报文")
+public class CenterUserVO extends Model {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "登录用户名")
+    private String loginName;
+
+    @ApiModelProperty(value = "登录密码")
+    private String loginPwd;
+
+    @ApiModelProperty(value = "中文姓名")
+    private String cnName;
+
+    @ApiModelProperty(value = "英文姓名")
+    private String enName;
+
+    @ApiModelProperty(value = "移动电话")
+    private String phone;
+
+    @ApiModelProperty(value = "固定电话")
+    private String telphone;
+
+    @ApiModelProperty(value = "0 男 1 女")
+    private String sex;
+
+    @ApiModelProperty(value = "邮箱地址")
+    private String email;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createUserId;
+
+    @ApiModelProperty(value = "修改人")
+    private Long updateUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "0 有效 1 无效")
+    private String isEnable;
+
+
+}

nafmii-admin/src/main/resources/mapper/CenterRoleMapper.xml

+<?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="org.nafmii.admin.user.dao.CenterRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterRolePO">
+        <id column="ID" property="id" />
+        <result column="R_NAME" property="rName" />
+        <result column="CREAT_TIME" property="creatTime" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="IS_ENABLE" property="isEnable" />
+        <result column="CREATE_USER_ID" property="createUserId" />
+        <result column="UPDATE_USER_ID" property="updateUserId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, R_NAME, CREAT_TIME, UPDATE_TIME, IS_ENABLE, CREATE_USER_ID, UPDATE_USER_ID
+    </sql>
+    <!-- 新增修改中心端角色 -->
+    <update id="updateRoleById" parameterType="map" >
+        update CENTER_ROLE
+        <set >
+            <if test="rName != null" >
+                R_NAME = #{rName,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null" >
+                UPDATE_TIME = #{updateTime,jdbcType=DATE},
+            </if>
+            <if test="isEnable != null" >
+                IS_ENABLE = #{isEnable,jdbcType=VARCHAR},
+            </if>
+            <if test="updateUserId != null" >
+                UPDATE_USER_ID = #{updateUserId,jdbcType=BIGINT},
+            </if>
+        </set>
+        where ID = #{id,jdbcType=VARCHAR}
+    </update>
+
+    <!-- 查询中心端角色 -->
+    <select id="queryRoles" resultType="org.nafmii.admin.user.vo.CenterRoleVO">
+        select
+        ID as id, R_NAME as rName, CREAT_TIME as creatTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId
+        from CENTER_ROLE
+    </select>
+
+    <!-- 删除中心端角色 -->
+    <delete id="deleteRoles">
+        delete
+        from CENTER_ROLE
+        where ID IN
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <!-- 中心端用户对应角色查询 -->
+    <select id="queryRolesByUser" resultType="java.util.List">
+        <!-- TODO -->
+    </select>
+</mapper>

nafmii-admin/src/main/resources/mapper/CenterUserMapper.xml

+<?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="org.nafmii.admin.user.dao.CenterUserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.CenterUserPO">
+        <id column="ID" property="id" />
+        <result column="LOGIN_NAME" property="loginName" />
+        <result column="LOGIN_PWD" property="loginPwd" />
+        <result column="CN_NAME" property="cnName" />
+        <result column="EN_NAME" property="enName" />
+        <result column="PHONE" property="phone" />
+        <result column="TELPHONE" property="telphone" />
+        <result column="SEX" property="sex" />
+        <result column="EMAIL" property="email" />
+        <result column="CREATE_USER_ID" property="createUserId" />
+        <result column="UPDATE_USER_ID" property="updateUserId" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="IS_ENABLE" property="isEnable" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, LOGIN_NAME, LOGIN_PWD, CN_NAME, EN_NAME, PHONE, TELPHONE, SEX, EMAIL, CREATE_USER_ID, UPDATE_USER_ID, CREATE_TIME, UPDATE_TIME, IS_ENABLE
+    </sql>
+    <!-- 根据登录人账号（手机号）查询用户信息 -->
+    <select id="selectUserByPhone" parameterType="java.util.Map" resultType="org.nafmii.admin.user.vo.CenterUserVO">
+        select
+        ID as id, LOGIN_NAME as loginName, LOGIN_PWD as loginPwd, CN_NAME as cnName, EN_NAME as enName, PHONE as phone,
+        TELPHONE as telphone, SEX as sex, EMAIL as email, CREATE_USER_ID as createUserId, UPDATE_USER_ID as updateUserId,
+        CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
+        from CENTER_USER where IS_ENABLE = 0
+        <if test="phone !=null">
+            and PHONE =#{phone}
+        </if>
+    </select>
+
+</mapper>