Skip to content

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

添加二次确认页面

parent 8de87d51
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 132 deletions
pom.xml
View file @ edd73cc5
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions> <!--<exclusions>-->
<exclusion> <!--<exclusion>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-logging</artifactId> <!--<artifactId>spring-boot-starter-logging</artifactId>-->
</exclusion> <!--</exclusion>-->
</exclusions> <!--</exclusions>-->
</dependency> </dependency>
<dependency> <dependency>
...@@ -66,23 +66,23 @@ ...@@ -66,23 +66,23 @@
<!--<version>1.2.17</version>--> <!--<version>1.2.17</version>-->
<!--</dependency>--> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.slf4j</groupId> <!--<groupId>org.slf4j</groupId>-->
<artifactId>slf4j-api</artifactId> <!--<artifactId>slf4j-api</artifactId>-->
<version>1.7.5</version> <!--<version>1.7.5</version>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.slf4j</groupId> <!--<groupId>org.slf4j</groupId>-->
<artifactId>slf4j-log4j12</artifactId> <!--<artifactId>slf4j-log4j12</artifactId>-->
<version>1.7.12</version> <!--<version>1.7.12</version>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>log4j</groupId> <!--<groupId>log4j</groupId>-->
<artifactId>log4j</artifactId> <!--<artifactId>log4j</artifactId>-->
<version>1.2.17</version> <!--<version>1.2.17</version>-->
</dependency> <!--</dependency>-->
<!-- shiro相关 --> <!-- shiro相关 -->
...@@ -109,21 +109,21 @@ ...@@ -109,21 +109,21 @@
<version>1.6.1</version> <version>1.6.1</version>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-web</artifactId> <!--<artifactId>spring-boot-starter-web</artifactId>-->
<exclusions> <!--<exclusions>-->
<exclusion> <!--<exclusion>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-logging</artifactId> <!--<artifactId>spring-boot-starter-logging</artifactId>-->
</exclusion> <!--</exclusion>-->
</exclusions> <!--</exclusions>-->
</dependency> <!--</dependency>-->
<dependency> <!--<dependency>-->
<groupId>org.springframework.boot</groupId> <!--<groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-log4j</artifactId> <!--<artifactId>spring-boot-starter-log4j</artifactId>-->
<version>1.3.8.RELEASE</version> <!--<version>1.3.8.RELEASE</version>-->
</dependency> <!--</dependency>-->
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>
......
src/countyList.xml deleted 100644 → 0
View file @ 8de87d51
<?xml version="1.0" encoding="UTF-8"?>
<countyLists>
<countyList county_List_Id="imooc-001" task_Id="20181204">
<saveDate>2018-12-04</saveDate>
<countyCode>413200</countyCode>
<finishCount>1030</finishCount>
<inStorageCount>1030</inStorageCount>
<outStorageCount>1030</outStorageCount>
</countyList>
<countyList county_List_Id="imooc-002" task_Id="20181205">
<saveDate>2018-12-05</saveDate>
<countyCode>413200</countyCode>
<finishCount>1030</finishCount>
<inStorageCount>1030</inStorageCount>
<outStorageCount>1030</outStorageCount>
</countyList>
</countyLists>
src/log4j.properties deleted 100644 → 0
View file @ 8de87d51
#控制日志级别，在哪里输出Output pattern : date [thread] priority category - message FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7
log4j.rootLogger=INFO, stdout
#控制台 显示的的方式为控制台普通方式
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
#打印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/java/com/yxproject/start/api/UserApi.java
View file @ edd73cc5
...@@ -14,23 +14,16 @@ import org.apache.shiro.authc.UnknownAccountException; ...@@ -14,23 +14,16 @@ import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.dom4j.*;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.*;
import org.hibernate.loader.plan.spi.Return;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import static java.lang.Integer.*; import static java.lang.Integer.parseInt;
import static java.lang.Integer.valueOf;
/** /**
* @author Administrator * @author Administrator
...@@ -512,8 +505,11 @@ public class UserApi { ...@@ -512,8 +505,11 @@ public class UserApi {
*/ */
@RequestMapping("selectProdCard") @RequestMapping("selectProdCard")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String selectProdCard(@RequestParam("idNo") List idNo, HttpServletResponse resp) { public String selectProdCard(@RequestParam("idNo") String idNo, HttpServletResponse resp) {
List<ProdCardEntity> taskEntity = prodCardService.getProdCard(idNo); JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> jsonArray1 = (Map<String, List>)jsonObject;
List list = jsonArray1.get("list");
List<ProdCardEntity> taskEntity = prodCardService.getProdCard(list);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity); yxjsonResponse.outPutSuccess(taskEntity);
......
src/main/resources/application.yml
View file @ edd73cc5
...@@ -7,24 +7,18 @@ mybatis: ...@@ -7,24 +7,18 @@ mybatis:
#加载Mybatis配置文件 #加载Mybatis配置文件
mapper-locations: classpath:mapper/*Mapper.xml mapper-locations: classpath:mapper/*Mapper.xml
config-location: classpath:mapper/config/mybatis-config.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数据库 #配置调度生产Oracle数据库
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.10.208:1521:GTYX url: jdbc:oracle:thin:@192.168.10.208:1521:GTYX
username: dahai username: dahai
password: dahai password: dahai
#配置shiro #配置shiro
shiro: shiro:
loginUrl: http://localhost:8081 loginUrl: http://localhost:8081
web: web:
enabled: true enabled: true
unauthorizedUrl: /page_404.html unauthorizedUrl: /page_404.html
src/main/resources/log4j.properties deleted 100644 → 0
View file @ 8de87d51
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/static/dialogs/confirmFailedCardsInfo.html 0 → 100644
View file @ edd73cc5
<div class="cl">
<div style="height: auto;width: auto">
<table class="table table-responsive table-hover">
<thead>
<th>NO.</th>
<th>受理号</th>
<th>姓名</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="item in dataInfo">
<td>{{$index + 1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.name}}</td>
<td ng-if="item.specialType==0">余证</td>
<td ng-if="item.specialType==1">快证</td>
<td ng-if="item.specialType==2" style="color: red;">退证</td>
</tr>
</tbody>
</table>
</div>
<div style="text-align: right;">
<span style="font-size:14px;color: red;padding-left:34px;" ng-if="alertError">{{alertError}}</span>
<button class="btn btn-info confirmBtn" ng-click="confirmFailedInfo()">确定</button>
<button style="margin-right: 10px" class="btn btn-info" ng-click="cancelThisDialog()&&closeThisDialog()">关闭</button>
<p ng-if="isShowSuccess==1" style="color: red;margin-right:20px;margin-top:10px;">{{AddSuccess}}</p>
</div>
</div>
src/main/resources/static/js/services/service.js
View file @ edd73cc5
...@@ -488,7 +488,7 @@ app.service('MessageService', function (ngDialog) { ...@@ -488,7 +488,7 @@ app.service('MessageService', function (ngDialog) {
getFailedType:function(success){ getFailedType:function(success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../user/getFailedType" + urlTimeStamp(), url: "../user/getFailedType" + urlTimeStamp()
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data,"-------------response.data------") console.log(response.data,"-------------response.data------")
success(response.data) success(response.data)
...@@ -497,6 +497,23 @@ app.service('MessageService', function (ngDialog) { ...@@ -497,6 +497,23 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
}, },
selectProdCard:function(idNo,success){
console.log(idNo,"+++++idno+++++")
$http({
method: 'GET',
url: "../user/selectProdCard" + urlTimeStamp(),
params:{
idNo:idNo
}
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
saveFailedCardsID:function(success){ saveFailedCardsID:function(success){
$http({ $http({
method: 'GET', method: 'GET',
......
src/main/resources/static/tpl/layout/addFailedCard/addFailedCard.js
View file @ edd73cc5
app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, $ngDialog) { app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if ($rootScope.loginData.login === false) { if ($rootScope.loginData.login === false) {
$state.go("signin") $state.go("signin")
...@@ -76,19 +76,17 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', ...@@ -76,19 +76,17 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
} }
var str = ""; var str = "";
if (myFailedcount == (checkArr.length * valueArr.length)) { if (myFailedcount == (checkArr.length * valueArr.length)) {
HttpService.remainderCyclesheetInfo(checkArr, function (data) { HttpService.selectProdCard(checkArr, function (data) {
console.log(">>>>>>>>>")
console.log(checkArr)
ngDialog.open({ ngDialog.open({
template: 'dialogs/confirmFailedCardsInfo.html' + urlTimeStamp(), template: 'dialogs/confirmFailedCardsInfo.html' + urlTimeStamp(),
width: '40%', width: '40%',
cache: false, cache: false,
controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService,MessageService) { controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService) {
$scope.dataInfo = data.respData; $scope.dataInfo = data.respData;
console.log($scope.dataInfo) console.log($scope.dataInfo,"-=====$scope.dataInfo====")
var count = 0; var count = 0;
for(var i=0;i<$scope.dataInfo.length;i++){ for(var i=0;i<$scope.dataInfo.size;i++){
if($scope.dataInfo[i][0]!=0){ if($scope.dataInfo[i].name!=null){
count+=1; count+=1;
}else{ }else{
continue; continue;
...@@ -100,7 +98,6 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', ...@@ -100,7 +98,6 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$(".confirmBtn").attr("disabled", true); $(".confirmBtn").attr("disabled", true);
if(count==$scope.dataInfo.length){ if(count==$scope.dataInfo.length){
HttpService.saveFailedCardsID($rootScope.arr,function(data){ HttpService.saveFailedCardsID($rootScope.arr,function(data){
$scope.isShowSuccess = 1; $scope.isShowSuccess = 1;
$scope.AddSuccess = data.respData.string; $scope.AddSuccess = data.respData.string;
$rootScope.emptyForm(); $rootScope.emptyForm();
...@@ -121,7 +118,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state', ...@@ -121,7 +118,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope.alertLb = "请检查您输入的废证受理号和身份证号是否全部正确！"; $scope.alertLb = "请检查您输入的废证受理号和身份证号是否全部正确！";
} }
}else{ }else{
MessageService.showAlert("废证受理号或身份证号存在空值或重复，请检查后再提交。") $scope.alertLb("废证受理号或身份证号存在空值或重复，请检查后再提交。")
} }
} }
......
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