Commit 87bcc3c8 by YANGYANG

公安部标注平台 标注模块和字典管理模块初始化提交

parent 00976702
......@@ -15,15 +15,28 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration//配置类
@EnableSwagger2 //swagger注解
public class SwaggerConfig {
public static final String bz = "com.founder.bz";
public static final String bzpt = "com.founder.bzpt";
public static final String zdgl = "com.founder.zdgl";
@Bean
public Docket asjApi(){
public Docket bzpt(){
return new Docket(DocumentationType.SWAGGER_2)
.groupName("bz")
.groupName("bzpt")
.apiInfo(webApiInfo())
.select()
.apis(RequestHandlerSelectors.basePackage(bz))
.apis(RequestHandlerSelectors.basePackage(bzpt))
.paths(Predicates.not(PathSelectors.regex("/admin/.*")))
.paths(Predicates.not(PathSelectors.regex("/error.*")))
.build();
}
@Bean
public Docket zdgl(){
return new Docket(DocumentationType.SWAGGER_2)
.groupName("zdgl")
.apiInfo(webApiInfo())
.select()
.apis(RequestHandlerSelectors.basePackage(zdgl))
.paths(Predicates.not(PathSelectors.regex("/admin/.*")))
.paths(Predicates.not(PathSelectors.regex("/error.*")))
.build();
......
......@@ -9,9 +9,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bz</artifactId>
<artifactId>bzpt</artifactId>
<build>
<finalName>bz</finalName>
<finalName>bzpt</finalName>
</build>
</project>
\ No newline at end of file
package com.founder.bz;
package com.founder.bzpt;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......
package com.founder.bz.controller;
package com.founder.bzpt.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -6,7 +6,7 @@ import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.ResultCode;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.bz.service.DlUserService;
import com.founder.bzpt.service.DlUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......
package com.founder.bz.mapper;
package com.founder.bzpt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.zdryEntity.DlUsers;
......
<?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="com.founder.bz.mapper.DlUserMapper">
<mapper namespace="com.founder.bzpt.mapper.DlUserMapper">
</mapper>
package com.founder.bz.service;
package com.founder.bzpt.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.zdryEntity.DlUsers;
......
package com.founder.bz.service.impl;
package com.founder.bzpt.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.bz.mapper.DlUserMapper;
import com.founder.bz.service.DlUserService;
import com.founder.bzpt.mapper.DlUserMapper;
import com.founder.bzpt.service.DlUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
......@@ -8,7 +8,7 @@ spring.cloud.nacos.discovery.server-addr=47.92.48.137:9949
spring.profiles.active=dev
# 该配置影响统一配置中心中的dataId
spring.application.name=bz
spring.application.name=bzpt
spring.cloud.nacos.config.namespace=f1160b5f-cef5-4e86-bddc-c55e28c2d8b0
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
......
......@@ -20,7 +20,7 @@ public class CodeGenerator {
@Test
public void run() {
// 1、创建代码生成器
/* // 1、创建代码生成器
AutoGenerator mpg = new AutoGenerator();
// 2、全局配置
......@@ -85,6 +85,6 @@ public class CodeGenerator {
// 6、执行
mpg.execute();
mpg.execute();*/
}
}
......@@ -10,7 +10,8 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<modules>
<module>bz</module>
<module>bzpt</module>
<module>zdgl</module>
</modules>
<artifactId>service</artifactId>
<dependencies>
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>service</artifactId>
<groupId>com.founder</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>zdgl</artifactId>
<build>
<finalName>zdgl</finalName>
</build>
</project>
\ No newline at end of file
package com.founder.zdgl;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = {"com.founder"})
@EnableDiscoveryClient
@EnableFeignClients
public class ZdglApplication {
public static void main(String[] args) {
SpringApplication.run(ZdglApplication.class, args);
}
}
package com.founder.zdgl.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.ResultCode;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.zdgl.service.DlUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/login")
@Api(tags = "登陆管理")
public class LoginController {
@Autowired
private DlUserService userService;
@ApiOperation(value = "登陆")
@PostMapping("/loginDl")
@ResponseBody
public MapRestResult login(HttpServletRequest request,
@ApiParam(name = "username", value = "用户名", required = true)
@RequestParam String username,
@ApiParam(name = "password", value = "密码", required = true)
@RequestParam String password){
DlUsers user = new DlUsers();
user.setUsername(username);
user.setPassword(password);
if (user!=null) {
DlUsers loginUser = userService.login(user,request);
if (loginUser == null) {
return MapRestResult.error("用户名或密码错误!");
} else {
return MapRestResult.build(ResultCode.SUCCESS,"登陆成功!","1",loginUser);
}
}
return MapRestResult.error();
}
@ApiOperation(value = "注销")
@PostMapping("/loginOut")
@ResponseBody
public Map<String,Object> loginOut(HttpServletRequest request, HttpServletResponse response){
Map<String,Object> returnMap=new HashMap<>();
DlUsers user=null;
user=(DlUsers)request.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
if(user!=null){
request.getSession().removeAttribute(CommonCodeConstant.LOGIN_USER_KEY);
returnMap.put("state","success");
returnMap.put("msg","退出成功!");
}
return returnMap;
}
@ApiOperation(value = "分页登录用户列表")
@GetMapping("dlUserPageList/{page}/{limit}")
public MapRestResult dluserPageList(
@ApiParam(name = "page", value = "当前页码", required = true)
@PathVariable Long page,
@ApiParam(name = "limit", value = "每页记录数", required = true)
@PathVariable Long limit,
@ApiParam(name = "trueName", value = "姓名")
@RequestParam(required = false) String trueName,
@ApiParam(name = "unitCode", value = "单位代码")
@RequestParam(required = false) String unitCode){
Page<DlUsers> pageParam = new Page<>(page + 1, limit);
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
if(StringUtils.isNotBlank(trueName)){
wrapper.like("true_name", trueName);
}
if(StringUtils.isNotBlank(unitCode)){
wrapper.like("unit_code", unitCode);
}
wrapper.eq("xxsc_pdbz", "0");
wrapper.orderByAsc("djsj");
userService.page(pageParam, wrapper);
List<DlUsers> records = pageParam.getRecords();
records.stream().forEach(p->{
try {
p.setPassword( new String(Base64.getDecoder().decode(p.getPassword()), "UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
});
long total = pageParam.getTotal();
return MapRestResult.build(ResultCode.SUCCESS,"成功获取登录用户列表信息",total,records);
}
@ApiOperation(value = "新增登录用户")
@PostMapping("/dlSaveUsers")
public MapRestResult saveUsers(@ApiParam(name = "DlUsers", value = "用户对象", required = true)
@RequestBody DlUsers dlUsers) {
try{
// 先查询是否有该用户 存在提示 该用户已存在 不存在插入
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
// 密码base64加密
String password = Base64.getEncoder().encodeToString(dlUsers.getPassword().getBytes());
dlUsers.setPassword(password);
wrapper.eq("username", dlUsers.getUsername());
wrapper.eq("xxsc_pdbz", "0");
DlUsers users = userService.getOne(wrapper);
if(null != users){
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","该用户已存在!");
}else{
boolean flag = userService.save(dlUsers);
if(flag){
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","1");
}
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败",e.getMessage(),"1");
}
}
@ApiOperation(value = "根据id查询登录用户信息")
@GetMapping("getdlUserByUsername/{id}")
public MapRestResult getById(
@ApiParam(name = "id", value = "主键编号", required = true)
@PathVariable String id){
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
wrapper.eq("id", id);
wrapper.eq("xxsc_pdbz", "0");
DlUsers users = userService.getOne(wrapper);
if(null != users){
// 密码base64解密
String password = null;
try {
password = new String(Base64.getDecoder().decode(users.getPassword()), "UTF-8");
users.setPassword(password);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
return MapRestResult.build(ResultCode.SUCCESS,"成功获取用户信息","1",users);
}else{
return MapRestResult.build(ResultCode.ERROR,"获取用户信息失败","1","1");
}
}
@ApiOperation(value = "修改登录用户信息")
@PostMapping("/updateDlUsersById")
public MapRestResult savePermission(@ApiParam(name = "DlUsers", value = "用户对象", required = true)
@RequestBody DlUsers dlUsers) {
try{
if(StringUtils.isNotEmpty(dlUsers.getPassword())){
// 密码base64加密
String password = Base64.getEncoder().encodeToString(dlUsers.getPassword().getBytes());
dlUsers.setPassword(password);
}
boolean flag = userService.updateById(dlUsers);
if(flag){
return MapRestResult.build(ResultCode.SUCCESS, "成功修改用户信息", "1","1");
}else{
return MapRestResult.build(ResultCode.ERROR, "修改用户信息失败", "1","1");
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"修改用户信息失败",e.getMessage(),"1");
}
}
@ApiOperation(value = "批量删除登录用户")
@PostMapping("/deleteDlUsersByIds")
public MapRestResult deleteUsersByIds(@RequestBody String[] ids) {
int i = 0;
boolean result = false;
for (String id : ids) {
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
wrapper.eq("id",id);
// 查询
DlUsers user = userService.getOne(wrapper);
// 修改数据
user.setXxscPdbz(1);
// 执行更新
result = userService.updateById(user);
i++;
}
if(result){
return MapRestResult.build(ResultCode.SUCCESS,"成功删除用户信息","1",i);
}else{
return MapRestResult.build(ResultCode.ERROR,"删除用户信息失败","1","1");
}
}
}
package com.founder.zdgl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.zdryEntity.DlUsers;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* <p>
* 系统用户信息 Mapper 接口
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
@Mapper
@Component
public interface DlUserMapper extends BaseMapper<DlUsers> {
}
<?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="com.founder.zdgl.mapper.DlUserMapper">
</mapper>
package com.founder.zdgl.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.zdryEntity.DlUsers;
import javax.servlet.http.HttpServletRequest;
/**
* <p>
* 系统用户信息 服务类
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
public interface DlUserService extends IService<DlUsers> {
DlUsers login(DlUsers user, HttpServletRequest request);
}
package com.founder.zdgl.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.zdgl.mapper.DlUserMapper;
import com.founder.zdgl.service.DlUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Base64;
/**
* <p>
* 系统用户信息 服务类
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
@Service
public class DlUserServiceImpl extends ServiceImpl<DlUserMapper, DlUsers> implements DlUserService {
@Autowired
private DlUserMapper userMapper;
@Override
public DlUsers login(DlUsers user, HttpServletRequest request) {
//对password进行加密
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
String password = Base64.getEncoder().encodeToString(user.getPassword().getBytes());
// 数据库字段名 对应值
wrapper.eq("USERNAME", user.getUsername());
wrapper.eq("PASSWORD", password);
wrapper.eq("XXSC_PDBZ", "0");
//设置需要查询的字段
wrapper.select("USERNAME", "UNIT_CODE","UNIT_NAME","TRUE_NAME");
user = userMapper.selectOne(wrapper);
if (user != null) {
request.getSession().setAttribute(CommonCodeConstant.LOGIN_USER_KEY, user);
}
return user;
}
}
#配置中心地址
spring.cloud.nacos.config.server-addr=47.92.48.137:9949
spring.cloud.nacos.discovery.server-addr=47.92.48.137:9949
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active=dev
# 该配置影响统一配置中心中的dataId
spring.application.name=zdgl
spring.cloud.nacos.config.namespace=f1160b5f-cef5-4e86-bddc-c55e28c2d8b0
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置,否则配置文件修改,工程无法感知
#spring.cloud.nacos.config.ext-config[0].refresh=true
#spring.cloud.nacos.config.shared-dataids=zdglpz.properties
#spring.cloud.nacos.config.refreshable-dataids=zdglpz.properties
management.health.elasticsearch.enabled: false
\ No newline at end of file
package com.founder.demo;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
import com.baomidou.mybatisplus.generator.config.GlobalConfig;
import com.baomidou.mybatisplus.generator.config.PackageConfig;
import com.baomidou.mybatisplus.generator.config.StrategyConfig;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import org.junit.Test;
/**
* @author yangyang
* @since 2021/05/30
*/
public class CodeGenerator {
@Test
public void run() {
/* // 1、创建代码生成器
AutoGenerator mpg = new AutoGenerator();
// 2、全局配置
GlobalConfig gc = new GlobalConfig();
String projectPath = System.getProperty("user.dir");
gc.setOutputDir("H:\\map-parent\\service\\zdry" + "/src/main/java");//生成路径
gc.setAuthor("yangyang");//作者
gc.setOpen(false); //生成后是否打开资源管理器
gc.setFileOverride(false); //重新生成时文件是否覆盖
//UserServie
gc.setServiceName("%sService"); //去掉Service接口的首字母I
gc.setIdType(IdType.ID_WORKER_STR); //主键策略
gc.setDateType(DateType.ONLY_DATE);//定义生成的实体类中日期类型
gc.setSwagger2(true);//开启Swagger2模式
mpg.setGlobalConfig(gc);
// 3、数据源配置
DataSourceConfig dsc = new DataSourceConfig();
// dsc.setUrl("jdbc:mysql://47.92.225.109:3900/guli?serverTimezone=GMT%2B8");
// dsc.setDriverName("com.mysql.cj.jdbc.Driver");
// dsc.setUsername("root");
// dsc.setPassword("root");
// dsc.setDbType(DbType.MYSQL);
dsc.setUrl("jdbc:mysql://47.92.225.109:3900/gkpt?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&serverTimezone=UTC");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("root");
dsc.setDbType(DbType.MYSQL);
mpg.setDataSource(dsc);
// 4、包配置
PackageConfig pc = new PackageConfig();
// pc.setModuleName("eszy"); //模块名
//包 com.atguigu.eduservice
// pc.setParent("com.founder");
//包 com.atguigu.eduservice.controller
//pc.setController("controller");
//pc.setEntity("entity");
// pc.setService("service");
// pc.setMapper("mapper");
//mpg.setPackageInfo(pc);
// 5、策略配置
StrategyConfig strategy = new StrategyConfig();
strategy.setInclude("users");//生成的表
strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体时去掉表前缀
strategy.setColumnNaming(NamingStrategy.underline_to_camel);//数据库表字段映射到实体的命名策略
strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作
strategy.setRestControllerStyle(true); //restful api风格控制器
strategy.setControllerMappingHyphenStyle(true); //url中驼峰转连字符
mpg.setStrategy(strategy);
// 6、执行
mpg.execute();*/
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment