流程管理

master
shijie 4 years ago
parent 0ca789b059
commit 14ec6646f1
  1. 76
      dq-financial-crms/src/main/resources/bootstrap.properties
  2. 1
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
  3. 81
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java
  4. 21
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageVisualController.java
  5. 23
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgProcessManageMapper.java
  6. 24
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgProcessManageVisualMapper.java
  7. 19
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgProessManageRes.java
  8. 26
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgProcessManageService.java
  9. 17
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgProcessManageVisualService.java
  10. 66
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgProcessManageServiceImpl.java
  11. 20
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgProcessManageVisualServiceImpl.java
  12. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java
  13. 72
      dq-financial-guarantee/src/main/resources/bootstrap.properties
  14. 25
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgProcessManageMapper.xml
  15. 30
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgProcessManageVisualMapper.xml
  16. 4
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
  17. 12
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java
  18. 74
      dq-financial-hrms-auth/src/main/resources/bootstrap.properties
  19. 74
      dq-financial-hrms/src/main/resources/bootstrap.properties
  20. 8
      dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
  21. 57
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgProcessManage.java
  22. 39
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgProcessManageVisual.java
  23. 66
      dq-govern-gateway/src/main/resources/bootstrap.properties

@ -1,20 +1,20 @@
#服务名称 ##服务名称
spring.application.name=dq-financial-crms #spring.application.name=dq-financial-crms
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#本地测试环境 #本地测试环境
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -29,20 +29,30 @@ ribbon.ConnectTimeout: 120000
# 正式环境(prod) # 正式环境(prod)
#服务名称 #服务名称
#spring.application.name=dq-financial-crms spring.application.name=dq-financial-crms
###配置中心地址 ##配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
##spring.cloud.nacos.config.group=prod #spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0

@ -122,7 +122,6 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
for (MultipartFile file : files) { //因为有上传多个文件,所以用的是MultipartFile[]数组,所以要遍历数组保存里面的每一个文件 for (MultipartFile file : files) { //因为有上传多个文件,所以用的是MultipartFile[]数组,所以要遍历数组保存里面的每一个文件
//String filePath = "http:"+File.separator+File.separator+"www.huorantech.cn"+File.separator+"enclosureFile"+File.separator;// "D:\\myfile\\i\\"; // 暂时设置保存在D盘的files目录下
String filePath =PromptSuccess.FILE_URL_PATH; String filePath =PromptSuccess.FILE_URL_PATH;
System.out.println(" 文件名称: " + file.getOriginalFilename()); System.out.println(" 文件名称: " + file.getOriginalFilename());
System.out.println(" 文件大小: " + file.getSize() / 1024D + "Kb"); System.out.println(" 文件大小: " + file.getSize() / 1024D + "Kb");

@ -0,0 +1,81 @@
package com.daqing.financial.guarantee.controller;
import com.alibaba.fastjson.JSONObject;
import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.model.response.DgProessManageRes;
import com.daqing.financial.guarantee.service.IDgProcessManageService;
import com.daqing.framework.domain.guarantee.DgProcessManage;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RedisUtil;
import com.daqing.framework.utils.PageUtils;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
/**
* <p>
* 流程管理表 前端控制器
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@RestController
@RequestMapping("/dg-process-manage")
public class DgProcessManageController {
@Autowired
private DgApplyAmountInfoController dgApplyAmountInfoController;
@Autowired
private IDgProcessManageService iDgProcessManageService;
/**
* 流程管理列表(可见范围内的人可以查看列表)
* @param
* @return
*/
@GetMapping("/processManageList")
@ApiOperation(value = "流程管理列表")
public ResponseResult processManageList(){
//获取当前登录用户id
String userId = dgApplyAmountInfoController.getUserId();
//查询可见范围内的人可见列表
List<DgProcessManage> list = iDgProcessManageService.processManageList(userId);
return new ResponseResult<PageUtils>().SUCCESS(list);
}
/**
* 查询审批模板对应的可见人员
* @param
* @return
*/
@GetMapping("/processVisualList")
@ApiOperation(value = "查询审批模板对应的可见人员")
public ResponseResult processVisualList(@RequestParam(value = "id") Integer id){
//查询可见范围内的人可见列表
List<Integer> list = iDgProcessManageService.processVisualList(id);
return new ResponseResult<PageUtils>().SUCCESS(list);
}
/**
* 修改人员可以看到审批模板
* @param id 流程管理id ids 可见人id
* @return
*/
@GetMapping("/updateUserVisual")
@ApiOperation(value = "修改人员可以看到审批模板")
public ResponseResult updateUserVisual(@RequestParam(value="id") Integer id,@RequestParam(value = "ids") List<Integer>ids){
//查询可见范围内的人可见列表
Boolean a= iDgProcessManageService.updateUserVisual(id,ids);
return new ResponseResult<PageUtils>().SUCCESS(a);
}
}

@ -0,0 +1,21 @@
package com.daqing.financial.guarantee.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 流程管理可见表 前端控制器
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@RestController
@RequestMapping("/dg-process-manage-visual")
public class DgProcessManageVisualController {
}

@ -0,0 +1,23 @@
package com.daqing.financial.guarantee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.daqing.framework.domain.guarantee.DgProcessManage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 流程管理表 Mapper 接口
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@Mapper
public interface DgProcessManageMapper extends BaseMapper<DgProcessManage> {
List<DgProcessManage> processManageList(@Param("usrId") int usrId);
}

@ -0,0 +1,24 @@
package com.daqing.financial.guarantee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.daqing.framework.domain.guarantee.DgProcessManageVisual;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 流程管理可见表 Mapper 接口
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@Mapper
public interface DgProcessManageVisualMapper extends BaseMapper<DgProcessManageVisual> {
List<Integer> processVisualList(@Param("id") Integer id);
int insertUserVisual(@Param("list")List<DgProcessManageVisual> list);
}

@ -0,0 +1,19 @@
package com.daqing.financial.guarantee.model.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author QYQ
* @DATE 2021/1/15 17:10
* @Version 1.0
*/
@Data
public class DgProessManageRes {
@ApiModelProperty("用户id")
private Integer userId;
@ApiModelProperty("员工姓名")
private String name;
}

@ -0,0 +1,26 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.guarantee.model.response.DgProessManageRes;
import com.daqing.framework.domain.guarantee.DgProcessManage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 流程管理表 服务类
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
public interface IDgProcessManageService extends IService<DgProcessManage> {
List<DgProcessManage> processManageList(String userId);
List<Integer> processVisualList(Integer id);
Boolean updateUserVisual(@Param("id") Integer id, @Param("ids") List<Integer> ids);
}

@ -0,0 +1,17 @@
package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.framework.domain.guarantee.DgProcessManageVisual;
/**
* <p>
* 流程管理可见表 服务类
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
public interface IDgProcessManageVisualService extends IService<DgProcessManageVisual> {
}

@ -0,0 +1,66 @@
package com.daqing.financial.guarantee.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.daqing.financial.guarantee.mapper.DgProcessManageMapper;
import com.daqing.financial.guarantee.mapper.DgProcessManageVisualMapper;
import com.daqing.financial.guarantee.model.response.DgProessManageRes;
import com.daqing.financial.guarantee.service.IDgProcessManageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.framework.domain.guarantee.DgProcessManage;
import com.daqing.framework.domain.guarantee.DgProcessManageVisual;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 流程管理表 服务实现类
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@Service
public class DgProcessManageServiceImpl extends ServiceImpl<DgProcessManageMapper, DgProcessManage> implements IDgProcessManageService {
@Autowired
private DgProcessManageVisualMapper dgProcessManageVisualMapper;
@Override
public List<DgProcessManage> processManageList(String userId) {
int usrId = Integer.parseInt(userId);
return this.baseMapper.processManageList(usrId);
}
@Override
public List<Integer> processVisualList(Integer id) {
//根据流程管理id查询可见人id
List<Integer> visualUserId = dgProcessManageVisualMapper.processVisualList(id);
return visualUserId;
}
@Override
public Boolean updateUserVisual(Integer id, List<Integer> ids) {
//先根据主键id删除所有对应可见模板员工
dgProcessManageVisualMapper.delete(new QueryWrapper<DgProcessManageVisual>()
.eq("process_manage_id",id));
//批量新增数据到流程管理可见表
List<DgProcessManageVisual> list = new ArrayList<>();
for (Integer i:ids) {
DgProcessManageVisual dgProcessManageVisual = new DgProcessManageVisual();
dgProcessManageVisual.setProcessManageId(id);
dgProcessManageVisual.setUserId(i);
list.add(dgProcessManageVisual);
}
int i = dgProcessManageVisualMapper.insertUserVisual(list);
if(i>0){
return true;
}else{
return false;
}
}
}

@ -0,0 +1,20 @@
package com.daqing.financial.guarantee.service.impl;
import com.daqing.financial.guarantee.mapper.DgProcessManageVisualMapper;
import com.daqing.financial.guarantee.service.IDgProcessManageVisualService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.framework.domain.guarantee.DgProcessManageVisual;
import org.springframework.stereotype.Service;
/**
* <p>
* 流程管理可见表 服务实现类
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@Service
public class DgProcessManageVisualServiceImpl extends ServiceImpl<DgProcessManageVisualMapper, DgProcessManageVisual> implements IDgProcessManageVisualService {
}

@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator {
public static final String PACKAGE_NAME = "com.daqing.financial.guarantee"; public static final String PACKAGE_NAME = "com.daqing.financial.guarantee";
public static void main(String[] args) { public static void main(String[] args) {
String[] tables = new String[] {"dg_copy_for","dg_process_user","dg_copy_user"};//表名数组 String[] tables = new String[] {"dg_process_manage_visual","dg_process_manage"};//表名数组
String[] tablePrefixs = new String[] {""};//去掉前缀 String[] tablePrefixs = new String[] {""};//去掉前缀
executeCode(PACKAGE_NAME,tables,tablePrefixs); executeCode(PACKAGE_NAME,tables,tablePrefixs);
} }

@ -1,21 +1,21 @@
#服务名称 #服务名称
spring.application.name=dq-financial-guarantee #spring.application.name=dq-financial-guarantee
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#本地测试环境 #本地测试环境
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -36,19 +36,29 @@ ribbon.ConnectTimeout: 120000
# #
##正式环境(prod) ##正式环境(prod)
##服务名称 ##服务名称
#spring.application.name=dq-financial-guarantee spring.application.name=dq-financial-guarantee
##配置中心地址 #配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826 spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0

@ -0,0 +1,25 @@
<?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.daqing.financial.guarantee.mapper.DgProcessManageMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgProcessManage">
<id column="id" property="id" />
<result column="icon_img" property="iconImg" />
<result column="model_id" property="modelId" />
<result column="approval_name" property="approvalName" />
<result column="update_time" property="updateTime" />
<result column="create_time" property="createTime" />
</resultMap>
<select id="processManageList" parameterType="int" resultMap="BaseResultMap">
SELECT pm.* FROM dg_process_manage pm
LEFT JOIN dg_process_manage_visual mv ON mv.process_manage_id=pm.id
<where>
<if test="usrId != null and usrId != ''">
mv.user_id = #{usrId}
</if>
</where>
</select>
</mapper>

@ -0,0 +1,30 @@
<?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.daqing.financial.guarantee.mapper.DgProcessManageVisualMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgProcessManageVisual">
<id column="id" property="id" />
<result column="process_manage_id" property="processManageId" />
<result column="user_id" property="userId" />
</resultMap>
<select id="processVisualList" parameterType="int" resultType="int">
select user_id from dg_process_manage_visual
<where>
<if test="id != null">
process_manage_id = #{id}
</if>
</where>
</select>
<insert id="insertUserVisual">
INSERT INTO dg_process_manage_visual
(process_manage_id,user_id)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.processManageId},#{item.userId})
</foreach>
</insert>
</mapper>

@ -156,8 +156,8 @@ public class UserLoginController implements UserLoginControllerApi {
headerImg = URLDecoder.decode(imgUrl,encoder); headerImg = URLDecoder.decode(imgUrl,encoder);
//account = new String(username.getBytes("GBK"),"iso-8859-1"); //account = new String(username.getBytes("GBK"),"iso-8859-1");
log.info("account==========="+account+"headerImg============="+headerImg); log.info("account==========="+account+"headerImg============="+headerImg);
response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg); //response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
//response.sendRedirect("http://www.huorantech.cn/dq/index.html#/Dashboard?token="+token+"&account="+account+"&headerImg="+headerImg); response.sendRedirect("http://www.huorantech.cn/dq/index.html#/Dashboard?token="+token+"&account="+account+"&headerImg="+headerImg);
} }
}else { }else {
userService.weChatBinding(code,response,state); userService.weChatBinding(code,response,state);

@ -90,8 +90,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
if(dbUser == null){//openId不存在,返回绑定手机号页面,须另写绑定手机号接口 if(dbUser == null){//openId不存在,返回绑定手机号页面,须另写绑定手机号接口
log.info("dbUser为空,openId不存在,请先绑定手机号哦~~~"); log.info("dbUser为空,openId不存在,请先绑定手机号哦~~~");
try { try {
//response.sendRedirect("http://www.huorantech.cn/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面 response.sendRedirect("http://www.huorantech.cn/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面 //response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5OpenId);//跳转绑定手机号页面
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -152,8 +152,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
if (countWeChatId > 0){ if (countWeChatId > 0){
try { try {
log.info("微信重复了,我走到了这里............................."); log.info("微信重复了,我走到了这里.............................");
//response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token+"&message=1"); response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token+"&message=1");
response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1"); //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -163,8 +163,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
if (result){ if (result){
try { try {
log.info("转发成功---------------------------------------"); log.info("转发成功---------------------------------------");
//response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token); response.sendRedirect("http://www.huorantech.cn/dq/index.html#/workbench-manpower?token="+token);
response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token); //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token);
}catch (IOException e){ }catch (IOException e){
e.printStackTrace(); e.printStackTrace();
} }

@ -1,21 +1,21 @@
#服务名称 #服务名称
spring.application.name=dq-financial-hrms-auth #spring.application.name=dq-financial-hrms-auth
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#本地测试环境 #本地测试环境
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -30,20 +30,30 @@ ribbon.ConnectTimeout: 30000
#正式环境(prod) #正式环境(prod)
#spring.application.name=dq-financial-hrms-auth spring.application.name=dq-financial-hrms-auth
#
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
##spring.cloud.nacos.config.group=prod #spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0

@ -1,21 +1,21 @@
##服务名称 ##服务名称
spring.application.name=dq-financial-hrms #spring.application.name=dq-financial-hrms
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#本地测试环境 #本地测试环境
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -33,20 +33,30 @@ spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod) # 正式环境(prod)
#服务名称 #服务名称
#spring.application.name=dq-financial-hrms spring.application.name=dq-financial-hrms
##配置中心地址 #配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43 spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
##spring.cloud.nacos.config.group=prod #spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=dq123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0

@ -32,16 +32,16 @@ public class PromptSuccess {
public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径 public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径
//public static final String IMAGE_URL_PATH = "http://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 public static final String IMAGE_URL_PATH = "http://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
public static final String IMAGE_URL_PATH = "http://8.129.127.185:8080/headImg/"; // 数据库/预加载图片路径 //public static final String IMAGE_URL_PATH = "http://8.129.127.185:8080/headImg/"; // 数据库/预加载图片路径
//public static final String IMAGE_URL_PATH = "http://47.107.237.129:8080/headImg/"; // 数据库/预加载图片路径 //public static final String IMAGE_URL_PATH = "http://47.107.237.129:8080/headImg/"; // 数据库/预加载图片路径
public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加 public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
public static final String STATUS_REFUSE = "拒绝"; public static final String STATUS_REFUSE = "拒绝";
//public static final String ENCLOSUREFILE_URL_PATH = "http://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 public static final String ENCLOSUREFILE_URL_PATH = "http://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185:8080/enclosureFile/"; // 附件文件存放路径 //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185:8080/enclosureFile/"; // 附件文件存放路径
//public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129:8080/enclosureFile/"; // 附件文件存放路径 //public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129:8080/enclosureFile/"; // 附件文件存放路径
public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径 public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径

@ -0,0 +1,57 @@
package com.daqing.framework.domain.guarantee;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 流程管理表
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@Data
@TableName("dg_process_manage")
public class DgProcessManage implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 图标
*/
private String iconImg;
/**
* 业务管理模块id
*/
private Integer modelId;
/**
* 审批名称
*/
private String approvalName;
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* 创建时间
*/
private Date createTime;
}

@ -0,0 +1,39 @@
package com.daqing.framework.domain.guarantee;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
* 流程管理可见表
* </p>
*
* @author Qyq
* @since 2021-01-15
*/
@Data
@TableName("dg_process_manage_visual")
public class DgProcessManageVisual implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 流程管理id
*/
private Integer processManageId;
/**
* 可见人id
*/
private Integer userId;
}

@ -1,21 +1,21 @@
#服务名称 #服务名称
spring.application.name=dq-govern-gateway #spring.application.name=dq-govern-gateway
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#本地测试环境 #本地测试环境
spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@ -28,21 +28,21 @@ spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod) # 正式环境(prod)
#服务名称 #服务名称
#spring.application.name=dq-govern-gateway spring.application.name=dq-govern-gateway
##配置中心地址 #配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009 spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
#spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=dq123456 spring.redis.password=dq123456
#spring.redis.database=0 spring.redis.database=0
#spring.redis.timeout=30000 spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
Loading…
Cancel
Save