haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
haozq 2024-08-21 09:07:42 +08:00
parent 11a52426cd
commit be007a8d52
8 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/bonus/aqgqj/basis/controller/CustomController.java
View File

@ -76,7 +76,7 @@ public class CustomController {
try { try {
BaseCustom u = customService.getCustom(data.getData().getCustomName(),data.getData().getCustomId()); BaseCustom u = customService.getCustom(data.getData().getCustomName(),data.getData().getCustomId());
if (u != null) { if (u != null) {
return ServerResponse.createErroe("单位客户名称 “"+data.getData().getCustomName() + "” 已存在"); return ServerResponse.createErroe("单位名称 “"+data.getData().getCustomName() + "” 已存在");
} }
customService.updateCustom(data.getData()); customService.updateCustom(data.getData());
return ServerResponse.createBySuccessMsg("操作成功"); return ServerResponse.createBySuccessMsg("操作成功");
@ -94,7 +94,7 @@ public class CustomController {
try { try {
BaseCustom u = customService.getAdd(data.getData().getCustomName()); BaseCustom u = customService.getAdd(data.getData().getCustomName());
if (u != null) { if (u != null) {
return ServerResponse.createErroe("单位客户名称 “"+data.getData().getCustomName() + "” 已存在"); return ServerResponse.createErroe("单位名称 “"+data.getData().getCustomName() + "” 已存在");
} }
customService.add(data.getData()); customService.add(data.getData());
return ServerResponse.createBySuccessMsg("操作成功"); return ServerResponse.createBySuccessMsg("操作成功");
@ -143,7 +143,7 @@ public class CustomController {
try { try {
BaseCustom u = customService.getAddDept(data.getData()); BaseCustom u = customService.getAddDept(data.getData());
if (u != null) { if (u != null) {
return ServerResponse.createErroe("部门客户名称 “"+data.getData().getCustomName() + "” 已存在"); return ServerResponse.createErroe("部门名称 “"+data.getData().getCustomName() + "” 已存在");
} }
customService.addDept(data.getData()); customService.addDept(data.getData());
return ServerResponse.createBySuccessMsg("添加成功"); return ServerResponse.createBySuccessMsg("添加成功");
@ -177,7 +177,7 @@ public class CustomController {
try { try {
BaseCustom u = customService.getDeptCustom(data.getData().getCustomName(),data.getData().getCustomId()); BaseCustom u = customService.getDeptCustom(data.getData().getCustomName(),data.getData().getCustomId());
if (u != null) { if (u != null) {
return ServerResponse.createErroe("部门客户名称 “"+data.getData().getCustomName() + "” 已存在"); return ServerResponse.createErroe("部门名称 “"+data.getData().getCustomName() + "” 已存在");
} }
customService.updateCustom(data.getData()); customService.updateCustom(data.getData());
return ServerResponse.createBySuccessMsg("操作成功"); return ServerResponse.createBySuccessMsg("操作成功");

9
src/main/java/com/bonus/aqgqj/basis/controller/TeamController.java
View File

@ -86,7 +86,9 @@ public class TeamController {
if (u != null) { if (u != null) {
return ServerResponse.createErroe("班组名称 “"+data.getData().getTeamName() + "” 已存在"); return ServerResponse.createErroe("班组名称 “"+data.getData().getTeamName() + "” 已存在");
} }
if(data.getData().getTeamName().length()>30){
return ServerResponse.createErroe("班组名称过长,不能超过30个字符");
}
String teamTypeName = teamService.getTypeName(data.getData().getTeamTypeCode()); String teamTypeName = teamService.getTypeName(data.getData().getTeamTypeCode());
data.getData().setTeamTypeName(teamTypeName); data.getData().setTeamTypeName(teamTypeName);
teamService.updateTeam(data.getData()); teamService.updateTeam(data.getData());
@ -105,7 +107,10 @@ public class TeamController {
try { try {
BaseTeam u = teamService.getAdd(data.getData().getTeamName()); BaseTeam u = teamService.getAdd(data.getData().getTeamName());
if (u != null) { if (u != null) {
return ServerResponse.createErroe("客户名称 “"+data.getData().getTeamName() + "” 已存在"); return ServerResponse.createErroe("班组名称 “"+data.getData().getTeamName() + "” 已存在");
}
if(data.getData().getTeamName().length()>30){
return ServerResponse.createErroe("班组名称过长,不能超过30个字符");
} }
String teamTypeName = teamService.getTypeName(data.getData().getTeamTypeCode()); String teamTypeName = teamService.getTypeName(data.getData().getTeamTypeCode());
data.getData().setTeamTypeName(teamTypeName); data.getData().setTeamTypeName(teamTypeName);

34
src/main/resources/application.properties
View File

@ -12,6 +12,10 @@ server.servlet.context-path=/szgqj
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=bonus@admin123 #spring.datasource.password=bonus@admin123
#spring.datasource.url=jdbc:mysql://192.168.1.16:13066/sz_aqgqj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#spring.datasource.username=root
#spring.datasource.password=Bonus@86mysql
spring.datasource.url=jdbc:mysql://192.168.0.7:13306/sz_aqgqj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://192.168.0.7:13306/sz_aqgqj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Bonus@admin123! spring.datasource.password=Bonus@admin123!
@ -32,20 +36,16 @@ server.tomcat.uri-encoding=UTF-8
mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
mybatis.type-aliases-package=com.bonus.aqgqj.*.vo mybatis.type-aliases-package=com.bonus.aqgqj.*.vo
#redis config #redis config
#spring.redis.host=localhost
spring.redis.host=192.168.0.14
spring.redis.port=2003
spring.redis.database=5
spring.redis.password=Fyzbns@Redis123!
#spring.redis.host=127.0.0.1 #spring.redis.host=192.168.1.16
#spring.redis.port=6379 #spring.redis.port=3306
#spring.redis.database=4
spring.redis.host=127.0.0.1
spring.redis.port=6379
#spring.redis.password=123456
#spring.redis.host=192.168.0.14
#spring.redis.port=2002
#spring.redis.database=5 #spring.redis.database=5
#spring.redis.password=Fyzbns@Redis123! #spring.redis.password=szwz@86redis!
# \u65E5\u5FD7 # \u65E5\u5FD7
logging.config=classpath:logback-boot.xml logging.config=classpath:logback-boot.xml
@ -67,7 +67,7 @@ token.expire.seconds=7200
spring.servlet.multipart.enabled=true spring.servlet.multipart.enabled=true
#\u662F\u5426\u5F00\u542F\u5B89\u5168\u6A21\u5F0F #\u662F\u5426\u5F00\u542F\u5B89\u5168\u6A21\u5F0F
zhly.aq.enable=false zhly.aq.enable=true
#\u6587\u4EF6\u8FC7\u6EE4 #\u6587\u4EF6\u8FC7\u6EE4
zhly.aq.file.suffix=woff,js,css,html,woff2,lang,map,png,jpg zhly.aq.file.suffix=woff,js,css,html,woff2,lang,map,png,jpg
#\u9759\u6001\u8D44\u6E90 \u4E0D\u62E6\u622A #\u9759\u6001\u8D44\u6E90 \u4E0D\u62E6\u622A
@ -91,11 +91,11 @@ quartz.scan=false
#spring.data.mongodb.username=zhlydb #spring.data.mongodb.username=zhlydb
#spring.data.mongodb.password=Bonus@admin123! #spring.data.mongodb.password=Bonus@admin123!
spring.data.mongodb.host=192.168.0.7 #spring.data.mongodb.host=192.168.0.7
spring.data.mongodb.port=27017 #spring.data.mongodb.port=27017
spring.data.mongodb.database=zhly_db #spring.data.mongodb.database=zhly_db
spring.data.mongodb.username=zhlydb #spring.data.mongodb.username=zhlydb
spring.data.mongodb.password=Bonus@admin123! #spring.data.mongodb.password=Bonus@admin123!
#mq #mq

60
src/main/resources/application.propertiesdev → src/main/resources/application.properties-opt
View File

@ -7,17 +7,17 @@
server.port=11997 server.port=11997
#\u8BBF\u95EE\u8DEF\u5F84 #\u8BBF\u95EE\u8DEF\u5F84
server.servlet.context-path=/zhly server.servlet.context-path=/szgqj
#mysql\u6570\u636E\u5E93\u8FDE\u63A5 #mysql\u6570\u636E\u5E93\u8FDE\u63A5
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=bonus@admin123 #spring.datasource.password=bonus@admin123
spring.datasource.url=jdbc:mysql://127.0.0.1:13306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://192.168.0.7:13306/sz_aqgqj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Bonus@admin123! spring.datasource.password=Bonus@admin123!
#spring.datasource.url=jdbc:mysql://192.168.0.7:13306/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/sz_aqgqj ?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=Bonus@admin123! #spring.datasource.password=jsk@131551
#spring.datasource.url=jdbc:mysql://192.168.0.14:2000/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #spring.datasource.url=jdbc:mysql://192.168.0.14:2000/bns_zhly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=zhly@mysql14! #spring.datasource.password=zhly@mysql14!
@ -30,16 +30,17 @@ server.session.timeout=10
server.tomcat.uri-encoding=UTF-8 server.tomcat.uri-encoding=UTF-8
#mapper\u914D\u7F6E #mapper\u914D\u7F6E
mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
mybatis.type-aliases-package=com.bonus.zhly.entity mybatis.type-aliases-package=com.bonus.aqgqj.*.vo
#redis config #redis config
#spring.redis.host=localhost #spring.redis.host=localhost
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.database=4
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=16379 spring.redis.port=6379
spring.redis.database=5 #spring.redis.password=123456
spring.redis.password=Bonus@admin123!
#spring.redis.host=192.168.0.14 #spring.redis.host=192.168.0.14
#spring.redis.port=2002 #spring.redis.port=2002
@ -78,44 +79,29 @@ zhly.aq.file.html=login.html,index.html,pages/user/updateMyself.html,pages/user/
zhly.hk.file.windows.path=D:/HKFILE/lib/HCNetSDK.dll zhly.hk.file.windows.path=D:/HKFILE/lib/HCNetSDK.dll
zhly.hk.file.linux.path=home/hksdk/libhcnetsdk.so zhly.hk.file.linux.path=home/hksdk/libhcnetsdk.so
file.windwos.upload_path=E:/aqgqj/files/
file.linux.upload_path=home/aqgqj/files/
file.windwos.upload_path=E:/zhly/files #????
file.linux.upload_path=home/zhly/files
#\u662F\u5426\u542F\u52A8quartz\u4EFB\u52A1\u626B\u63CF\u5668
quartz.scan=false quartz.scan=false
#mongodb\u914D\u7F6E #mongodb\u914D\u7F6E
#spring.data.mongodb.host=192.168.0.7 #spring.data.mongodb.host=192.168.0.14
#spring.data.mongodb.port=27017 #spring.data.mongodb.port=27017
#spring.data.mongodb.database=zhly_db #spring.data.mongodb.database=zhly_db
#spring.data.mongodb.username=zhlydb #spring.data.mongodb.username=zhlydb
#spring.data.mongodb.password=Bonus@admin123! #spring.data.mongodb.password=Bonus@admin123!
spring.data.mongodb.host=127.0.0.1
spring.data.mongodb.host=192.168.0.7
spring.data.mongodb.port=27017 spring.data.mongodb.port=27017
spring.data.mongodb.database=yn_db spring.data.mongodb.database=zhly_db
spring.data.mongodb.username=yn_db spring.data.mongodb.username=zhlydb
spring.data.mongodb.password=Bonus@admin123! spring.data.mongodb.password=Bonus@admin123!
#spring.data.mongodb.host=192.168.0.7
#spring.data.mongodb.port=27017
#spring.data.mongodb.database=yn_db
#spring.data.mongodb.username=yn_db
#spring.data.mongodb.password=Bonus@admin123!
#mq #mq
spring.rabbitmq.host=127.0.0.1 #spring.rabbitmq.host=192.168.0.14
spring.rabbitmq.port=5672 #spring.rabbitmq.port=5672
spring.rabbitmq.username=guest #spring.rabbitmq.username=guest
spring.rabbitmq.password=Bonus@admin123! #spring.rabbitmq.password=guest
#广播 配置
gb.url=http://192.168.1.3:81
gb.username=admin
gb.password=123456
#设备控制请求地址
zhly.hk.requestIp=http://192.168.0.7:18088

5
src/main/resources/mappers/exper/DeviceMapper.xml
View File

@ -38,13 +38,14 @@
<select id="getDevice" resultMap="ExperDeviceResult"> <select id="getDevice" resultMap="ExperDeviceResult">
select dev_id,dev_name,dev_module,dev_code,contract_date,create_time,update_time,data_source select dev_id,dev_name,dev_module,dev_code,contract_date,create_time,update_time,data_source
from tb_exper_device from tb_exper_device
where dev_name = #{devName} and dev_id != #{devId} where dev_name = #{devName} and dev_id != #{devId} AND del_flag=0
</select> </select>
<select id="getAdd" resultMap="ExperDeviceResult"> <select id="getAdd" resultMap="ExperDeviceResult">
select dev_id,dev_name,dev_module,dev_code,contract_date,create_time,update_time,data_source select dev_id,dev_name,dev_module,dev_code,contract_date,create_time,update_time,data_source
from tb_exper_device from tb_exper_device
where dev_name = #{devName} where dev_name = #{devName} AND del_flag=0
</select> </select>

14
src/main/resources/static/js/home/home.js
View File

@ -11,9 +11,15 @@ layui.use(['form', 'layer', 'table', 'laydate','carousel','util'], function () {
echartstwo(); echartstwo();
iniTable(); iniTable();
// layui-table-body // layui-table-body
}) })
// 设置一个每2000毫秒执行一次的定时任务
// 设置一个每2000毫秒执行一次的定时任务
let intervalId2 = setInterval(function() {
initApproe();
}, 40000);
function openNewModule(type){ function openNewModule(type){
console.log(type) console.log(type)
if(type==1){ if(type==1){
@ -27,12 +33,6 @@ function openNewModule(type){
} }
function initApproe(){ function initApproe(){
var dispatchWorkNum=0;
var testNum =0;
var reloadReviewNUm=0;
var reviewNUm =0;
var examineNum =0;
var approvalNum =0;
$.ajax({ $.ajax({
url: dataUrl + "/home/getApprovalNum", url: dataUrl + "/home/getApprovalNum",
headers: { headers: {
@ -43,13 +43,13 @@ function initApproe(){
success: function (result) { success: function (result) {
if (result.code == 200) { if (result.code == 200) {
if (result.data) { if (result.data) {
localStorage.setItem("hisAppData",result.data);
$("#dispatchWorkNum").html(result.data.dispatchWorkNum); $("#dispatchWorkNum").html(result.data.dispatchWorkNum);
$("#testNum").html(result.data.testNum); $("#testNum").html(result.data.testNum);
$("#reloadReviewNUm").html(result.data.reloadReviewNUm); $("#reloadReviewNUm").html(result.data.reloadReviewNUm);
$("#reviewNUm").html(result.data.reviewNUm); $("#reviewNUm").html(result.data.reviewNUm);
$("#examineNum").html(result.data.examineNum); $("#examineNum").html(result.data.examineNum);
$("#approvalNum").html(result.data.approvalNum); $("#approvalNum").html(result.data.approvalNum);
var objs=$(".updateDate"); var objs=$(".updateDate");
$.each(objs, function (index, item) { $.each(objs, function (index, item) {
$(item).html(result.data.updateDate) $(item).html(result.data.updateDate)

22
src/main/resources/static/js/publicJs.js
View File

@ -2,16 +2,28 @@ var ctxPath = getContextPath();
let aqEnnable = true;//是否开启安全验证 let aqEnnable = true;//是否开启安全验证
// console.log(ctxPath) // console.log(ctxPath)
var url=window.location.href; var url=window.location.href;
// console.log(url) console.log(url)
let dataUrl = "http://192.168.0.14:11997/szgqj"
if(url.indexOf("127.0.0.1")!=-1){ let test_url="http://192.168.0.14:11997/szgqj";
dataUrl = "http://127.0.0.1:11997/szgqj" let dev_url="http://112.27.246.86:21997/szgqj";
let dev_url2="https://jj.jypxks.com/szgqj";
let local_url="http://127.0.0.1:21997/szgqj";
let dataUrl = "http://112.27.246.86:21997/szgqj"
if(url.indexOf("112.27.246.86")!=-1){
dataUrl = dev_url;
}else if(url.indexOf("jj.jypxks.com")!=-1){
dataUrl = dev_url2;
}else if(url.indexOf("127.0.0.1")!=-1 || url.indexOf("localhost")!=-1){
dataUrl = local_url
}else if(url.indexOf("192.168.0.14")!=-1){
dataUrl = test_url
}else{ }else{
if(url.indexOf(":8000")!=-1){ if(url.indexOf(":8000")!=-1){
dataUrl = "http://192.168.0.14:8000/szgqj" dataUrl = "http://192.168.0.14:8000/szgqj"
} }
if(url.indexOf(":11997")!=-1){ if(url.indexOf(":11997")!=-1){
dataUrl = "http://192.168.0.14:11997/szgqj" dataUrl = "http://192.168.0.14:21997/szgqj"
} }
} }

2
src/main/resources/static/pages/menu/menuList.html
View File

@ -70,8 +70,6 @@
<script type="text/javascript"> <script type="text/javascript">
var pers = checkPermission(); var pers = checkPermission();
// 渲染表格 // 渲染表格
var treemenu = { var treemenu = {
reload: function (data) { reload: function (data) {