登录用户趋势图处理以及抄送生成类文件

dq-financial-crms/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-financial-crms
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.config.file-extension=yml
 #redis配置
 spring.redis.host=127.0.0.1

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java

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

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-financial-guarantee
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.config.file-extension=yml
 #redis配置
 spring.redis.host=127.0.0.1

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java

@@ -156,7 +156,7 @@ public class UserLoginController implements UserLoginControllerApi {
                   headerImg = URLDecoder.decode(imgUrl,encoder);
                 //account = new String(username.getBytes("GBK"),"iso-8859-1");
                 log.info("account==========="+account+"headerImg============="+headerImg);
-                response.sendRedirect("http://www.huorantech.cn/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);
             }
         }else {

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/HrmsAccessRecordsLogServiceImpl.java

@@ -190,7 +190,7 @@ public class HrmsAccessRecordsLogServiceImpl extends ServiceImpl<HrmsAccessRecor
         List list = new ArrayList();
         List list2 = new ArrayList();
         //首先通过for循环遍历所有的偶数
-        for(int i=0;i<dayHour;i=i+2){
+        for(int i=0;i<=dayHour;i=i+2){
             //通过stream.filter()过滤时间段属性,access即为0对应的0->1时间段以及对应登录人数，或者2对应的2->3时间段以及对应的登录人数
             String s1 = frontCompWithZore(2, i);
             String s2 = frontCompWithZore(2, i+1);
@@ -202,14 +202,14 @@ public class HrmsAccessRecordsLogServiceImpl extends ServiceImpl<HrmsAccessRecor
             //获取对应的偶数时间段以及对应的登录用户数
             String loginTime=null;
             for (AccessRecordsObjRes res:access) {
-                loginTime = s1;
+                loginTime = s1+":00";
                 Integer loginSum = res.getLoginSum();
                 res.setLoginSum(loginSum);
 
             }
             int sum = access.stream().mapToInt(AccessRecordsObjRes::getLoginSum).sum();
             if(sum==0){
-                loginTime=s1;
+                loginTime=s1+":00";
             }
             list.add(loginTime);
             list2.add(sum);

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java

@@ -90,7 +90,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if(dbUser == null){//openId不存在，返回绑定手机号页面,须另写绑定手机号接口
             log.info("dbUser为空，openId不存在，请先绑定手机号哦~~~");
             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);//跳转绑定手机号页面
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -151,7 +152,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
         if (countWeChatId > 0){
                 try {
                     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");
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -161,7 +163,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
             if (result){
                 try {
                     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);
                 }catch (IOException e){
                     e.printStackTrace();
                 }

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-financial-hrms-auth
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.config.file-extension=yml
 #redis配置
 spring.redis.host=127.0.0.1

dq-financial-hrms/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 ##服务名称
 spring.application.name=dq-financial-hrms
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.config.file-extension=yml
 #redis配置
 spring.redis.host=127.0.0.1

dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java

@@ -33,16 +33,16 @@ public class PromptSuccess {
     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://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 STATUS_REFUSE = "拒绝";
 
     //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//"; // 附件文件存放路径
 

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-govern-gateway
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.140:8848
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.config.file-extension=yml
 #redis配置
 spring.redis.host=127.0.0.1

dq_financial_hrms/src/main/resources/mapper/hrauth/HrmsAccessRecordsLogMapper.xml

@@ -1,15 +0,0 @@
-<?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.hrauth.mapper.HrmsAccessRecordsLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.daqing.financial.hrauth.hrms.HrmsAccessRecordsLog">
-        <id column="id" property="id" />
-        <result column="account" property="account" />
-        <result column="name" property="name" />
-        <result column="deptName" property="deptName" />
-        <result column="type" property="type" />
-        <result column="login_time" property="loginTime" />
-    </resultMap>
-
-</mapper>