Skip to content

Y
YX_IDENT_REFACTORING
Commit c6757674 authored by Administrator's avatar Administrator
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 402c306a cbe8eb1f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 97 deletions
pom.xml
View file @ c6757674
......@@ -28,6 +28,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
......@@ -50,9 +56,35 @@
<!--引入log4j2作为日志组件-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-log4j2</artifactId>-->
<!--<artifactId>spring-boot-starter-log4j</artifactId>-->
<!--<version>1.3.2.RELEASE</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>log4j</groupId>-->
<!--<artifactId>log4j</artifactId>-->
<!--<version>1.2.17</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- shiro相关 -->
<dependency>
<groupId>org.apache.shiro</groupId>
......@@ -77,6 +109,22 @@
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j</artifactId>
<version>1.3.8.RELEASE</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
......
src/log4j.properties
View file @ c6757674
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file
log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#控制日志级别，在哪里输出Output pattern : date [thread] priority category - message FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7
log4j.rootLogger=INFO, stdout
#logger input file
log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#控制台 显示的的方式为控制台普通方式
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
#日志输出的格式
log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
#error log input file
log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file
#打印sql部分
log4j.logger.java.sql=DEBUG
log4j.logger.java.sql.Connection = DEBUG
log4j.logger.java.sql.Statement = DEBUG
log4j.logger.java.sql.PreparedStatement = DEBUG
log4j.logger.java.sql.ResultSet = DEBUG
log4j.logger.com.yxproject.start.entity=DEBUG
\ No newline at end of file
src/main/resources/application.yml
View file @ c6757674
......@@ -7,6 +7,11 @@ mybatis:
#加载Mybatis配置文件
mapper-locations: classpath:mapper/*Mapper.xml
config-location: classpath:mapper/config/mybatis-config.xml
#logging.level.*=DEBUG
#logging:
# level:
# com.yx_project.start.mapper.*: debug
# logging.level.com.hz.controller=WARN #控制器层
#配置调度生产Oracle数据库
spring:
......@@ -16,6 +21,7 @@ spring:
username: dahai
password: dahai
#配置shiro
shiro:
loginUrl: http://localhost:8081
......
src/main/resources/log4j.properties
View file @ c6757674
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file
log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#logger input file
log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file
log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.rootCategory=DEBUG,stdout,DebugAppender,InfoAppender,ErrorAppender
log4j.debug=true log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[QC] %p [%t] %C.%M(%L) | %m%n
#logger input file log4j.logger.DebugAppender.access=DEBUG
log4j.appender.DebugAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DebugAppender.File=../logs/a.log
log4j.appender.DebugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#logger input file log4j.logger.InfoAppender.access=INFO
log4j.appender.InfoAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.InfoAppender.File=../logs/b.log
log4j.appender.InfoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.InfoAppender.layout.ConversionPattern=%d-[TS] %p %t %c - %m%n
#error log input file log4j.logger.ErrorAppender.access=ERROR
log4j.appender.ErrorAppender=org.apache.log4j.DailyRollingFileAppender
log4j.appender.ErrorAppender.File=../logs/c.log
log4j.appender.ErrorAppender.Append = true
log4j.appender.ErrorAppender.threshold = ERROR
log4j.appender.ErrorAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorAppender.layout.ConversionPattern=%d{MM-dd HH:mm:ss.SSS} %c %-5p - %m%n
\ No newline at end of file
src/main/resources/mapper/config/mybatis-config.xml
View file @ c6757674
......@@ -19,4 +19,10 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
<!--</plugin>-->
<!--</plugins>-->
<!--<settings>-->
<!--<setting name="log4jImpl" value="LOG4J"/>-->
<!--</settings>-->
</configuration>
\ No newline at end of file
src/main/resources/static/dialogs/specialCardList.html
View file @ c6757674
......@@ -12,10 +12,10 @@
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
<td>{{specialCard.accept_No}}</td>
<td ng-if="specialCard.special_Type==0">余证</td>
<td ng-if="specialCard.special_Type==1">快证</td>
<td ng-if="specialCard.special_Type==2">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/js/services/service.js
View file @ c6757674
......@@ -381,12 +381,13 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getTypeListByTaskStateId:function(state,success){
getTypeListByTaskStateId:function(userState,success){
console.log('----测试查询代码----',userState)
$http({
method: 'GET',
url: "../user/getTypeListByTaskStateId" + urlTimeStamp(),
params:{
taskStateId:state
taskStateId:userState
}
}).then(function successCallback(response) {
success(response.data)
......@@ -398,9 +399,9 @@ app.service('MessageService', function (ngDialog) {
getCityListByCardType:function(cardType,state,success){
$http({
method: 'GET',
url: "../user/getCityListByCardType" + urlTimeStamp(),
url: "../user/getCityList" + urlTimeStamp(),
params:{
state:state,
taskStateId:state,
cardType:cardType
}
}).then(function successCallback(response) {
......@@ -413,9 +414,9 @@ app.service('MessageService', function (ngDialog) {
getGroupNoByTaskListId:function(taskStateId,success){
$http({
method: 'GET',
url: "../user/getGroupNoByTaskListId" + urlTimeStamp(),
url: "../user/getGroupListByTaskId" + urlTimeStamp(),
params:{
taskStateId:taskStateId
taskId:taskStateId
}
}).then(function successCallback(response) {
success(response.data)
......@@ -441,7 +442,7 @@ app.service('MessageService', function (ngDialog) {
updateProductionTask:function(taskId,state,success){
$http({
method: 'GET',
url: "../user/updateProductionTask" + urlTimeStamp(),
url: "../user/updateTaskState" + urlTimeStamp(),
params:{
taskId:taskId,
state:state
......@@ -471,7 +472,7 @@ app.service('MessageService', function (ngDialog) {
getReceiptData:function(startTime, endTime,success){
$http({
method: 'GET',
url: "../user/getConnectList" + urlTimeStamp(),
url: "../user/getReceiptList" + urlTimeStamp(),
params:{
startTime:startTime,
endTime:endTime
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ c6757674
......@@ -59,7 +59,7 @@
</thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tr>
<td>{{city.task_Id}}</td>
<td>{{city.taskId}}</td>
<td><span class="city"
style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
<td>{{city.groupCount}}</td>
......@@ -70,14 +70,14 @@
<span style="padding-left:10px;"
ng-show="city.printer_Id==null">未分配</span>
<span style="padding-left:10px;"
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
ng-show="city.printer_Id!=null">机器<span>{{city.printerId}}</span></span>
</td>
<td>{{city.state}}</td>
<td ng-if="userState<=4"><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
<td ng-if="userState<=4"><a ng-click="showTable(city.taskId)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.taskId)">区县列表</a></td>
<td><a ng-click="finishClick(city.taskId,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.task_Id && userState<=4">
<tr ng-show="showtable==city.taskId && userState<=4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
......@@ -90,9 +90,9 @@
</thead>
<tbody>
<tr ng-repeat="group in groupList">
<td>{{group.groupNO}}</td>
<td>{{group.vaildCount}}</td>
<td>{{group.invaildCount}}</td>
<td>{{group.groupNo}}</td>
<td>{{group.validCount}}</td>
<td>{{group.invalidCount}}</td>
<td>{{group.specialCardCount}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr>
......@@ -101,7 +101,7 @@
</td>
</tr>
<tr ng-show="showtable==city.task_Id && userState>4">
<tr ng-show="showtable==city.taskId && userState>4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
......
src/main/resources/static/tpl/layout/receipt/receipt.js
View file @ c6757674
......@@ -30,8 +30,10 @@ app.controller('receiptCtrl', ['$scope', '$rootScope', '$http', '$state', '$filt
return currentdate;
}
$scope.currentDetailDate = getNowFormatDetailDate();
$scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00")
$scope.nowDate = new Date().format("yyyy-MM-dd hh:mm");
// $scope.nowDataEight = new Date().format("yyyy-MM-dd 08:00");
var date = new Date();
$scope.nowDataEight = $filter('date')("yyyy-MM-dd 08:00");
$scope.nowDate = $filter('date')("yyyy-MM-dd hh:mm");
var changeDataFormat = function (date) {
var yyyyMMdd = date.split(" ")[0];
......
src/main/resources/static/tpl/layout/yieldReport/yieldReport.js
View file @ c6757674
......@@ -5,7 +5,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} else {
$state.go("layout.yieldReport")
}
$scope.userState = $rootScope.loginData.state;
$scope.userState = $rootScope.workshop;
// $scope.userState=5;
......@@ -48,10 +48,10 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
$scope.month_last = getMonthLastDay();
var getQualityReport = function (startDate, endDate) {
HttpService.getQualityReport(startDate, endDate, function (data) {
$scope.dataCheckData = data.respData;
console.log("初始化数据核验质量报表：", $scope.dataCheckData)
})
// HttpService.getQualityReport(startDate, endDate, function (data) {
// $scope.dataCheckData = data.respData;
// console.log("初始化数据核验质量报表：", $scope.dataCheckData)
// })
}
//初始化数据核验报表
if ($rootScope.loginData.state == 1 || $rootScope.loginData.state == 0) {
......@@ -89,7 +89,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPrintData(startDate, endDate, $scope.state.substring(1, 2), function (data) {
HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表：", $scope.printDataReport)
})
......@@ -128,23 +128,23 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
}
var getQualityCheckReport = function (month) {
if ($rootScope.loginData.state == 6) {
HttpService.getQualityCheckReportData(month, function (data) {
$scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
$scope.qulityCheckData = data.respData;
console.log("质检报表：", $scope.qulityCheckData)
})
}
// if ($rootScope.loginData.state == 6) {
// HttpService.getQualityCheckReportData(month, function (data) {
// $scope.qulityCheckData = data.respData;
// console.log("质检报表：", $scope.qulityCheckData)
// })
// }
// if ($rootScope.loginData.state == 0) {
// HttpService.getAdminQualityCheckReportData(month, $scope.state.substring(1, 2), function (data) {
// $scope.qulityCheckData = data.respData;
// console.log("质检报表：", $scope.qulityCheckData)
// })
// }
}
if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
getQualityCheckReport($scope.nowMonth)
}
// if ($rootScope.loginData.state == 6 || $rootScope.loginData.state == 0) {
// getQualityCheckReport($scope.nowMonth)
// }
$scope.printQualityCheckReport = function () {
var month = $("#wdateZj").val()
......
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