hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

This commit is contained in:
xiang2lin 2024-09-29 16:36:45 +08:00
parent 2cfeec1f99 59ce4792f9
commit b4021a91e2
10 changed files with 80 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/resources/application-dongj.yml
View File

@ -12,7 +12,7 @@ spring:
dynamic:
datasource:
master:
url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
url: jdbc:mysql://115.239.174.22:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
password: 62e4295b615a30dbf3b8ee96f41c820b
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置

2
buildpackage/src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
server:
port: 9999
port: 8901
servlet:
context-path: /kangarooDataCenterV3
localIP: 127.0.0.1

45
service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.java
View File

@ -31,6 +31,51 @@ public class ReceiptForEntity extends BaseEntity {
private String contractno;
private String djlxbm;//交易类型编码
private String pj_jsfs;//结算方式编码
private String scomment;//备注
private String zyx22;//合同号
private String zyx24;//合同名称
private String zyx28;//用途
private String szxmid;//收支项目
public String getSzxmid() {
return szxmid;
}
public void setSzxmid(String szxmid) {
this.szxmid = szxmid;
}
public String getZyx28() {
return zyx28;
}
public void setZyx28(String zyx28) {
this.zyx28 = zyx28;
}
public String getZyx22() {
return zyx22;
}
public void setZyx22(String zyx22) {
this.zyx22 = zyx22;
}
public String getZyx24() {
return zyx24;
}
public void setZyx24(String zyx24) {
this.zyx24 = zyx24;
}
public String getScomment() {
return scomment;
}
public void setScomment(String scomment) {
this.scomment = scomment;
}
public String getPj_jsfs() {
return pj_jsfs;

18
service/src/main/java/com/hzya/frame/seeyon/receiptFor/entity/ReceiptForEntity.xml
View File

@ -19,16 +19,21 @@
<result property="wldx" column="r_wldx" jdbcType="INTEGER"/>
<result property="deptid" column="r_deptid" jdbcType="VARCHAR"/>
<result property="ywybm" column="r_ywybm" jdbcType="VARCHAR"/>
<result property="bfyhzh" column="r_bfyhzh" jdbcType="VARCHAR"/>
<result property="bfyhzh" column="bfyhzh" jdbcType="VARCHAR"/>
<result property="skyhmc" column="r_skyhmc" jdbcType="VARCHAR"/>
<result property="dfyhzh" column="r_dfyhzh" jdbcType="VARCHAR"/>
<result property="fkyhmc" column="r_fkyhmc" jdbcType="VARCHAR"/>
<result property="bzbm" column="r_bzbm" jdbcType="VARCHAR"/>
<result property="scomment" column="scomment" jdbcType="VARCHAR"/>
<result property="fph" column="r_fph" jdbcType="VARCHAR"/>
<result property="zy" column="r_zy" jdbcType="VARCHAR"/>
<result property="bzbm_code" column="r_bzbm_code" jdbcType="VARCHAR"/>
<result property="dfbbje" column="r_dfbbje" jdbcType="VARCHAR"/>
<result property="dfyhzh" column="dfyhzh" jdbcType="VARCHAR"/>
<result property="zyx22" column="zyx22" jdbcType="VARCHAR"/>
<result property="zyx24" column="zyx24" jdbcType="VARCHAR"/>
<result property="zyx28" column="zyx28" jdbcType="VARCHAR"/>
<result property="szxmid" column="szxmid" jdbcType="VARCHAR"/>
</resultMap>
<!-- <select id="ReceiptForEntity_list_base" resultMap="get-ReceiptForEntity-result" parameterType="com.hzya.frame.seeyon.receiptFor.entity.ReceiptForEntity">-->
@ -80,12 +85,17 @@
field0001 as r_djbh,
field0004 as r_wldx,
field0091 as r_deptid,
field0060 as r_bfyhzh,
field0060 as dfyhzh,
field0062 as r_skyhmc,
field0014 as r_dfyhzh,
field0051 as r_fkyhmc,
field0073 as r_bzbm,
field0092 as r_ywybm
field0068 as scomment,
field0042 as zyx22,
field0009 as zyx24,
field0092 as r_ywybm,
field0096 as szxmid,
field0058 as zyx28
from formmain_0045
where field0089 is null
and finishedflag = '1'

9
service/src/main/java/com/hzya/frame/seeyon/receiptFor/service/impl/ReceiptForServiceImpl.java
View File

@ -211,10 +211,15 @@ public class ReceiptForServiceImpl extends BaseService<ReceiptForEntity,String>
//parentvo.put("wldx",rec.getWldx());
parentvo.put("deptid",rec.getDeptid());
//parentvo.put("ywybm",rec.getYwybm());
parentvo.put("bfyhzh",rec.getBfyhzh());
parentvo.put("bfyhzh",rec.getBfyhzh());//本方银行账号
parentvo.put("skyhmc",rec.getSkyhmc());//收款银行账号
parentvo.put("pj_jsfs",rec.getPj_jsfs());//结算方式
//parentvo.put("dfyhzh",rec.getDfyhzh());
parentvo.put("dfyhzh",rec.getDfyhzh());//对方银行账号
parentvo.put("scomment",rec.getScomment());//备注
parentvo.put("zyx22",rec.getZyx22());//合同号
parentvo.put("zyx24",rec.getZyx24());//合同名称
parentvo.put("zyx28",rec.getZyx28());//用途
parentvo.put("szxmid",rec.getSzxmid());//收支项目
parentvo.put("fkyhmc",rec.getFkyhmc());
parentvo.put("bzbm",rec.getBzbm());

8
service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
View File

@ -105,10 +105,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
//查询主表数据
List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
//递归查询组织树
if(comparisonEntities.get(0).getViewName().equals("1")){
return recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
}
// //递归查询组织树
// if(comparisonEntities.get(0).getViewName().equals("1")){
// return recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
// }
if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) {

2
service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java
View File

@ -122,7 +122,7 @@ public class LoginServiceImpl implements ILoginService {
List<SysOrganEntity> sysOrganEntities = sysOrganDao.queryUserCompany(sysOrganEntity);
//返回值
JSONObject res = new JSONObject();
res.put("token", token);
res.put("zt-token", token);
res.put("userInfo", sysUserEntity);
res.put("company", sysOrganEntities);

4
webapp/src/main/java/com/hzya/frame/webapp/entrance/service/impl/EntranceServiceImpl.java
View File

@ -128,8 +128,8 @@ public class EntranceServiceImpl implements IEntranceService {
//}
// 接口权限验证 结束
} catch (NotLoginException e) {
logger.error("token无效");
return BaseResult.getFailureMessageEntity("token无效");
logger.error("zt-token无效");
return BaseResult.getFailureMessageEntity("zt-token无效");
}
}
JSONObject jsonObject = new JSONObject();

8
webapp/src/main/java/com/hzya/frame/webapp/web/exception/ExceptionController.java
View File

@ -63,13 +63,13 @@ public class ExceptionController {
if (notLoginException.getType().equals(NotLoginException.NOT_TOKEN)) {
message = "未提供token";
} else if (notLoginException.getType().equals(NotLoginException.INVALID_TOKEN)) {
message = "token无效";
message = "zt-token无效";
} else if (notLoginException.getType().equals(NotLoginException.TOKEN_TIMEOUT)) {
message = "token已过期";
message = "zt-token已过期";
} else if (notLoginException.getType().equals(NotLoginException.BE_REPLACED)) {
message = "token已被顶下线";
message = "zt-token已被顶下线";
} else if (notLoginException.getType().equals(NotLoginException.KICK_OUT)) {
message = "token已被踢下线";
message = "zt-token已被踢下线";
} else {
message = "当前会话未登录";
}

2
webapp/src/main/java/com/hzya/frame/webapp/web/filter/SaTokenConfigure.java
View File

@ -18,7 +18,7 @@ public class SaTokenConfigure {
@Primary
public SaTokenConfig getSaTokenConfigPrimary() {
SaTokenConfig config = new SaTokenConfig();
config.setTokenName("token"); // token名称 (同时也是cookie名称)
config.setTokenName("zt-token"); // token名称 (同时也是cookie名称)
config.setTimeout(30 * 24 * 60 * 60); // token有效期，单位s 默认30天
config.setActivityTimeout(-1); // token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
config.setIsConcurrent(true); // 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)